summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-01-06 19:53:32 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-06 23:18:20 -0800
commite423ffd8a6f46a14ecbb637d909290bd3579cebd (patch)
treedcb6814de273d92e9577b1ee6e459657b468e7b0 /git-merge-resolve.sh
parentformat-patch: autonumber by default (diff)
downloadtgif-e423ffd8a6f46a14ecbb637d909290bd3579cebd.tar.xz
diff: accept -- when using --no-index
Accept -- as an "end of options" marker even when using --no-index. Previously, the -- triggered a "normal" index/tree diff and subsequently failed because of the unrecognized (in that mode) --no-index. Note that the second loop can treat '--' as a normal option, because the preceding checks ensure it is the third-to-last argument. While at it, fix the parsing of "-q" option in --no-index mode as well. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions