]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2c657ed b64c1e0)
Merge branch 'ss/commit-squash-msg'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:10 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:10 +0000 (11:39 -0700)
commita6822e4172a8fa889b10a7a363088d2a05932b9b
tree2ab9df60af3d64f241818db7c856df18768280aatree | snapshot
parent2c657edce704ec7e91dfc03de5d882b4327369f4commit | diff
parentb64c1e0718f4a54d75b8faf0421471faa531af68commit | diff
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
builtin/commit.c diff1 | diff2 | blob | history
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.