global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-03 06:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
2f8ebbc3c2ed3b6cf989f14ea262b2ec0b7ffa59
git/builtin/commit.c
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
Reference in New Issue View Git Blame Copy Permalink