| commit | d5bc6f292ab0a1715ff021f5854ac5a81c2b88b0 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 27 Apr 2018 20:48:16 +0000 (27 22:48 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 May 2018 22:47:47 +0000 (2 07:47 +0900) | ||
| tree | 02831ad6b2c8f35c3f26bc11a436ba641b0d2103 | treesnapshot (tar.gz zip) |
| parent | 468165c1d8a442994a825f3684528361727cd8c0 | commitdiff |
rebase -i: demonstrate bugs with fixup!/squash! commit messages
When multiple fixup/squash commands are processed and the last one
causes merge conflicts and is skipped, we leave the "This is a
combination of ..." comments in the commit message.
Noticed by Eric Sunshine.
This regression test also demonstrates that we rely on the localized
version of
# This is a combination of <number> commits
to contain the <number> in ASCII, which breaks under GETTEXT_POISON.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When multiple fixup/squash commands are processed and the last one
causes merge conflicts and is skipped, we leave the "This is a
combination of ..." comments in the commit message.
Noticed by Eric Sunshine.
This regression test also demonstrates that we rely on the localized
version of
# This is a combination of <number> commits
to contain the <number> in ASCII, which breaks under GETTEXT_POISON.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3418-rebase-continue.sh | diffblobblamehistory |