aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 11:35:01 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 11:35:02 -0700
commite7cc0ede1837b6f679e245e29ae3687fc5e6c20d (patch)
treef20fa96fad6afd13fd97cd895bdbc7e173a3c29e /builtin/commit.c
parentMerge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' (diff)
parentgit-show: fix 'git show -s' to not add extra terminator after merge commit (diff)
downloadgit-e7cc0ede1837b6f679e245e29ae3687fc5e6c20d.tar.gz
git-e7cc0ede1837b6f679e245e29ae3687fc5e6c20d.zip
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions