| commit | e7cc0ede1837b6f679e245e29ae3687fc5e6c20d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jun 2014 18:35:01 +0000 (6 11:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jun 2014 18:35:02 +0000 (6 11:35 -0700) | ||
| tree | f20fa96fad6afd13fd97cd895bdbc7e173a3c29e | treesnapshot (tar.gz zip) |
| parent | 7e03f416633b5dbd242d6552e239d50a821262c6 | commitdiff |
| parent | ad2f7255b3e93dacd0982a946d30f6595dd8a805 | commitdiff |
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after 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 |