diff options
| author | David Aguilar <davvid@gmail.com> | 2008-12-19 17:01:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:10:58 -0800 |
| commit | ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0 (patch) | |
| tree | 11c6f880579d1d7c3aacd4185b76b47b128e652d /git-mergetool.sh | |
| parent | 0e73b3ee6ca95e1db2fe801d2b8544f4c27991df (diff) | |
| download | git-ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0.tar.gz git-ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0.tar.xz | |
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>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 ;; -*) |