diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-15 03:57:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-15 03:57:48 +0200 |
| commit | ea7fefbd7b25deb7c0b4da56d95d67116edded48 (patch) | |
| tree | f77f4d58e74102c4dffa8b37e176ff210c681e3b /t/t0203-gettext-setlocale-sanity.sh | |
| parent | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint (diff) | |
| parent | commit: do not lose SQUASH_MSG contents (diff) | |
| download | git-ea7fefbd7b25deb7c0b4da56d95d67116edded48.tar.xz git-ea7fefbd7b25deb7c0b4da56d95d67116edded48.zip | |
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
Diffstat (limited to 't/t0203-gettext-setlocale-sanity.sh')
0 files changed, 0 insertions, 0 deletions