summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-08 02:23:42 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-08 02:23:42 -0800
commit5c9afcff1aa048abf95296231d51fa481304a735 (patch)
tree44fabdca14aeacb74b61195c194ee33e43e6e1a2 /Documentation/git-mergetool.txt
parent60e3cad92ed93120b9e77116163b267fdda44f91 (diff)
parentc1ce83a5b64618a8a4ac313da82c156558cbe259 (diff)
downloadgit-5c9afcff1aa048abf95296231d51fa481304a735.tar.gz
Merge branch 'aw/maint-shortlog-blank-lines'
* aw/maint-shortlog-blank-lines: shortlog: take the first populated line of the description
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions