summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 19:15:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 19:15:03 -0700
commit109440c1bf2a3015cd9253515f07231c4cf9d65a (patch)
tree356abfc21c6afc50e660abbea2b8bb373c14d03d /git-mergetool.sh
parentDocumentation: fix graph in git-rev-parse.txt (diff)
parentbisect: print an error message when "git rev-list --bisect-vars" fails (diff)
downloadtgif-109440c1bf2a3015cd9253515f07231c4cf9d65a.tar.xz
Merge branch 'gp/bisect-fix' into maint
* gp/bisect-fix: bisect: print an error message when "git rev-list --bisect-vars" fails git-bisect.sh: don't accidentally override existing branch "bisect"
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions