From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:49:39 +0000 (-0700)
Subject: Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
X-Git-Tag: v2.0.1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85785df6d6db50ff37d0ff1878c16ad69a063f6a;p=git

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
---

85785df6d6db50ff37d0ff1878c16ad69a063f6a