summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-28 18:21:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-28 18:21:46 (GMT)
commitcd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (patch)
tree1dec0df37dae5154604064c4c8a8b50e90058a16 /git-mergetool--lib.sh
parentc1e01b0c5106451770ae77a62f52acfe814c3326 (diff)
parent7c3baa9abf0abe15f068d95688bbc27e73a69042 (diff)
downloadgit-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.zip
git-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.tar.gz
git-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.tar.bz2
Merge branch 'maint'
* maint: help -a: do not unnecessarily look for a repository Do not try to remove directories when removing old links rebase -i: more graceful handling of invalid commands help -i: properly error out if no info viewer can be found
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions