| commit | 4a3bf32b6c7e5d832e02f30a78ad23dc6ba15dcc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 May 2018 05:38:18 +0000 (23 14:38 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 May 2018 05:38:18 +0000 (23 14:38 +0900) | ||
| tree | c1e06ca0d405814f0fc4c747abcf33316e704be2 | treesnapshot (tar.gz zip) |
| parent | 10174da9f1643eb939d93d479547494baf77377b | commitdiff |
| parent | 15ef69314d54945471603223bef00091673b5725 | commitdiff |
Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
"git rebase -i" sometimes left intermediate "# This is a
combination of N commits" message meant for the human consumption
inside an editor in the final result in certain corner cases, which
has been fixed.
* js/rebase-i-clean-msg-after-fixup-continue:
rebase --skip: clean up commit message after a failed fixup/squash
sequencer: always commit without editing when asked for
rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
rebase -i: demonstrate bugs with fixup!/squash! commit messages
"git rebase -i" sometimes left intermediate "# This is a
combination of N commits" message meant for the human consumption
inside an editor in the final result in certain corner cases, which
has been fixed.
* js/rebase-i-clean-msg-after-fixup-continue:
rebase --skip: clean up commit message after a failed fixup/squash
sequencer: always commit without editing when asked for
rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
rebase -i: demonstrate bugs with fixup!/squash! commit messages
| sequencer.c | diff1 | diff2 | blobhistory |
| t/t3418-rebase-continue.sh | diff1 | diff2 | blobhistory |