projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0e73b3e) | patch
git-mergetool: properly handle "git mergetool -- filename"
authorDavid Aguilar <davvid@gmail.com>
Sat, 20 Dec 2008 01:01:01 +0000 (17:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Dec 2008 03:10:58 +0000 (19:10 -0800)
commitce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0
tree11c6f880579d1d7c3aacd4185b76b47b128e652dtree | snapshot
parent0e73b3ee6ca95e1db2fe801d2b8544f4c27991dfcommit | diff
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>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker