summaryrefslogtreecommitdiff
path: root/t/t7102-reset.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:49:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-25 11:49:39 -0700
commit85785df6d6db50ff37d0ff1878c16ad69a063f6a (patch)
tree795c85b0b9254583286d5cb08a43f33e63509e87 /t/t7102-reset.sh
parentMerge branch 'rr/rebase-autostash-fix' into maint (diff)
parentgit-show: fix 'git show -s' to not add extra terminator after merge commit (diff)
downloadtgif-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 't/t7102-reset.sh')
0 files changed, 0 insertions, 0 deletions