| commit | 85785df6d6db50ff37d0ff1878c16ad69a063f6a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:49:39 +0000 (25 11:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:49:39 +0000 (25 11:49 -0700) | ||
| tree | 795c85b0b9254583286d5cb08a43f33e63509e87 | treesnapshot (tar.gz zip) |
| parent | d9036cd28c9b115fe38e2f629292f2ddf60fb805 | commitdiff |
| parent | ad2f7255b3e93dacd0982a946d30f6595dd8a805 | commitdiff |
Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
"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
"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
| combine-diff.c | diff1 | diff2 | blobhistory |