development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
David Aguilar 2008-12-19 17:01:01 -08:00 committed by Junio C Hamano
parent 0e73b3ee6c
commit ce2c3ebbc5
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
git-mergetool.sh
View file

@ -296,6 +296,7 @@ do
esac esac
;; ;;
--) --)
shift
break break
;; ;;
-*) -*)