Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Jun 2014 18:49:39 +0000
(11:49 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Jun 2014 18:49:39 +0000
(11:49 -0700)
"git show -s" (i.e. show log message only) used to incorrectly emit
an extra blank line after a merge commit.
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after merge commit
1
2
combine-diff.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d9036cd
ad2f725
)
diff --cc
combine-diff.c
Simple merge