From ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Fri, 19 Dec 2008 17:01:01 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- git-mergetool.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-mergetool.sh') 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 ;; -*) -- cgit v1.2.1