summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-one-octopus_branches-one
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:57:48 -0700
commitea7fefbd7b25deb7c0b4da56d95d67116edded48 (patch)
treef77f4d58e74102c4dffa8b37e176ff210c681e3b /t/t5515/fetch.br-branches-one-octopus_branches-one
parentMerge branch 'jk/send-email-rtrim-mailrc-alias' into maint (diff)
parentcommit: do not lose SQUASH_MSG contents (diff)
downloadtgif-ea7fefbd7b25deb7c0b4da56d95d67116edded48.tar.xz
Merge branch 'ss/commit-squash-msg' into maint
When "git merge --squash" stopped due to conflict, the concluding "git commit" failed to read in the SQUASH_MSG that shows the log messages from all the squashed commits. * ss/commit-squash-msg: commit: do not lose SQUASH_MSG contents
Diffstat (limited to 't/t5515/fetch.br-branches-one-octopus_branches-one')
0 files changed, 0 insertions, 0 deletions