summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:33:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:33:54 -0800
commit8b49408421bba8a928c207991bc197a226b65782 (patch)
tree8f244b7ca0f0cae55ab8f7b77ea2535e4b0d2d8f /t/t7607-merge-overwrite.sh
parentMerge branch 'jk/gettext-poison' (diff)
parentrebase -p: fix incorrect commit message when calling `git merge`. (diff)
downloadtgif-8b49408421bba8a928c207991bc197a226b65782.tar.xz
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
"git rebase -p" mangled log messages of a merge commit, which is now fixed. * js/fix-merge-arg-quoting-in-rebase-p: rebase -p: fix incorrect commit message when calling `git merge`.
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions