git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: 0e73b3e)
git-mergetool: properly handle "git mergetool -- filename"
authorDavid Aguilar <redacted>
Sat, 20 Dec 2008 01:01:01 +0000 (17:01 -0800)
committerJunio C Hamano <redacted>
Sat, 20 Dec 2008 03:10:58 +0000 (19:10 -0800)
Like many git commands, git-mergetool allows "--" to signal
the end of option processing.  This adds a missing "shift"
statement so that this is correctly handled.

Signed-off-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mergetool.sh patch | blob | history

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 94187c306ccb05d977f2bb35e81828130ab49a61..d4078a6affd9b4c1fa52e6dba0fe6c151fa452dc 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
            esac
            ;;
        --)
+           shift
            break
            ;;
        -*)
git clone https://git.99rst.org/PROJECT