Merge branch 'ss/commit-squash-msg' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:48 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:48 +0000 (18:57 -0700)
commitea7fefbd7b25deb7c0b4da56d95d67116edded48
treef77f4d58e74102c4dffa8b37e176ff210c681e3b
parent8cad7fcfbcba99fa1541bf6ca1f2ad83767fc348
parentb64c1e0718f4a54d75b8faf0421471faa531af68
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
builtin/commit.c
t/t7600-merge.sh