diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2008-12-15 11:05:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-21 01:08:51 -0800 |
| commit | f5b49ea6191c2d631d1d70305b25d5db3bf05c92 (patch) | |
| tree | f341e3f91d09639cb194557ffc0a821eef5ae146 /diff-no-index.c | |
| parent | Show a failure of rebase -p if the merge had a conflict (diff) | |
| download | tgif-f5b49ea6191c2d631d1d70305b25d5db3bf05c92.tar.xz | |
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>
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions