From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Andreas Ericsson <ae@op5.se>,
Stephen Haberman <stephen@exigencecorp.com>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] rebase -i -p: Fix --continue after a merge could not be redone
Date: Mon, 15 Dec 2008 02:16:05 -0800 [thread overview]
Message-ID: <7v3agpyc9m.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1229335531-32707-2-git-send-email-j6t@kdbg.org> (Johannes Sixt's message of "Mon, 15 Dec 2008 11:05:31 +0100")
Johannes Sixt <j6t@kdbg.org> 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 <j6t@kdbg.org>
> ---
> 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?
next prev parent reply other threads:[~2008-12-15 10:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 16:21 [PATCH] Show a failure of rebase -p if the merge had a conflict Johannes Sixt
2008-12-15 10:05 ` [PATCH 1/2 updated] " Johannes Sixt
2008-12-15 10:05 ` [PATCH 2/2] rebase -i -p: Fix --continue after a merge could not be redone Johannes Sixt
2008-12-15 10:16 ` Junio C Hamano [this message]
2008-12-22 21:06 ` Johannes Schindelin
2008-12-22 21:16 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v3agpyc9m.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=stephen@exigencecorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).