diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:39 -0700 |
| commit | 85785df6d6db50ff37d0ff1878c16ad69a063f6a (patch) | |
| tree | 795c85b0b9254583286d5cb08a43f33e63509e87 /contrib/diff-highlight | |
| parent | Merge branch 'rr/rebase-autostash-fix' into maint (diff) | |
| parent | git-show: fix 'git show -s' to not add extra terminator after merge commit (diff) | |
| download | tgif-85785df6d6db50ff37d0ff1878c16ad69a063f6a.tar.xz | |
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
Diffstat (limited to 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions