Junio C Hamano ea7fefbd7b 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

2016-04-14 18:57:48 -07:00

53 KiB

Raw Blame History

View Raw