From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:57:48 +0000 (-0700)
Subject: Merge branch 'ss/commit-squash-msg' into maint
X-Git-Tag: v2.8.2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea7fefbd7b25deb7c0b4da56d95d67116edded48?ds=inline;hp=--cc

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
---

ea7fefbd7b25deb7c0b4da56d95d67116edded48