summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorBrian Gernhardt <brian@gernhardtsoftware.com>2010-09-24 22:15:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-27 04:27:37 (GMT)
commit9027fa9eb7df606b6658dd48a40bb993ce222ddd (patch)
treeff216c0ddd51651f61aeb8127d7a2d4bec6f0088 /git-mergetool.sh
parent3fcb88785da831ad7d53cf18b4398099179c9c87 (diff)
downloadgit-9027fa9eb7df606b6658dd48a40bb993ce222ddd.zip
git-9027fa9eb7df606b6658dd48a40bb993ce222ddd.tar.gz
git-9027fa9eb7df606b6658dd48a40bb993ce222ddd.tar.bz2
git-stash: fix flag parsing
Currently git-stash uses `git rev-parse --no-revs -- "$@"` to set its FLAGS variable. This is the same as `FLAGS="-- $@"`. It should use `git rev-parse --no-revs --flags "$@"`, but that eats any "-q" or "--quiet" argument. So move the check for quiet before rev-parse. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions