| commit | f5b49ea6191c2d631d1d70305b25d5db3bf05c92 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Mon, 15 Dec 2008 10:05:31 +0000 (15 11:05 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Dec 2008 09:08:51 +0000 (21 01:08 -0800) | ||
| tree | f341e3f91d09639cb194557ffc0a821eef5ae146 | treesnapshot (tar.gz zip) |
| parent | 03c4829347e26c844e589c61567a77a77c0658a9 | commitdiff |
rebase -i -p: Fix --continue after a merge could not be redone
When a merge that has a conflict was rebased, then rebase stopped to let
the user resolve the conflicts. However, thereafter --continue failed
because the author-script was not saved. (This is rebase -i's way to
preserve a commit's authorship.) This fixes it by doing taking the same
failure route after a merge that is also taken after a normal cherry-pick.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a merge that has a conflict was rebased, then rebase stopped to let
the user resolve the conflicts. However, thereafter --continue failed
because the author-script was not saved. (This is rebase -i's way to
preserve a commit's authorship.) This fixes it by doing taking the same
failure route after a merge that is also taken after a normal cherry-pick.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3409-rebase-preserve-merges.sh | diffblobblamehistory |