diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-06 18:39:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 18:39:10 (GMT) |
| commit | a6822e4172a8fa889b10a7a363088d2a05932b9b (patch) | |
| tree | 2ab9df60af3d64f241818db7c856df18768280aa /builtin/merge.c | |
| parent | 2c657edce704ec7e91dfc03de5d882b4327369f4 (diff) | |
| parent | b64c1e0718f4a54d75b8faf0421471faa531af68 (diff) | |
| download | git-a6822e4172a8fa889b10a7a363088d2a05932b9b.zip git-a6822e4172a8fa889b10a7a363088d2a05932b9b.tar.gz git-a6822e4172a8fa889b10a7a363088d2a05932b9b.tar.bz2 | |
Merge branch 'ss/commit-squash-msg'
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions