From: Junio C Hamano Date: Mon, 15 Dec 2008 10:16:05 GMT Subject: Re: [PATCH 2/2] rebase -i -p: Fix --continue after a merge could not be redone Message-ID: <7v3agpyc9m.fsf@gitster.siamese.dyndns.org> In-Reply-To: <1229335531-32707-2-git-send-email-j6t@kdbg.org> Johannes Sixt writes: > 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 > --- > This is an attempt at fixing the failure. I don't know whether it is > problematic to leave a "patch" behind if there was actually a merge. > Nevertheless, all rebase tests pass. Interesting approach. Dscho?