]> git.ipfire.org Git - thirdparty/git.git/commit - combine-diff.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e03f41 ad2f725)
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:35:01 +0000 (11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:35:02 +0000 (11:35 -0700)
commite7cc0ede1837b6f679e245e29ae3687fc5e6c20d
treef20fa96fad6afd13fd97cd895bdbc7e173a3c29etree | snapshot
parent7e03f416633b5dbd242d6552e239d50a821262c6commit | diff
parentad2f7255b3e93dacd0982a946d30f6595dd8a805commit | diff
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
combine-diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.