summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 14:43:03 -0700
committerJunio C Hamano <gitster@pobox.com>2011-07-22 14:43:03 -0700
commit4f9aba9c26d18d44e3a51b57d0e548a0cb39fcd9 (patch)
tree97172e91ce0fa00b20af42bccd04724421d4aa57 /Documentation/git-mergetool--lib.txt
parentf50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f (diff)
parent25d33546d474c7c28b72013c262fc23337cb3b21 (diff)
downloadgit-4f9aba9c26d18d44e3a51b57d0e548a0cb39fcd9.tar.gz
Merge branch 'jc/checkout-reflog-fix'
* jc/checkout-reflog-fix: checkout: do not write bogus reflog entry out
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions