From: David Aguilar <davvid@gmail.com>
Date: Sat, 20 Dec 2008 01:01:01 +0000 (-0800)
Subject: git-mergetool: properly handle "git mergetool -- filename"
X-Git-Tag: v1.6.0.6~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0;p=git.git

git-mergetool: properly handle "git mergetool -- filename"

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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 94187c306..d4078a6af 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)