From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 15 Feb 2011 21:51:41 GMT
Subject: Re: [RFC/PATCH 0/2] CHERRY_HEAD
Message-ID: <AANLkTik2NM+mxKgZy_9dCwydz+An4sFM_a4U9mdrJBq3@mail.gmail.com>
In-Reply-To: <1297805034-3512-1-git-send-email-jaysoffian@gmail.com>

On Tue, Feb 15, 2011 at 22:23, Jay Soffian <jaysoffian@gmail.com> wrote:
> The user-experience after a cherry-pick conflicts is suboptimal.
> The user has two choices for committing the resolved state:

I've read this over, haven't run it, but I really like the idea. It
sucks that you have to save away the commit sha1 somwhere after a
failed cherry-pick to use it again. It should just behave like `git
rebase --continue`, which this implements.

It'll need some tests as a non-RFC, but otherwise it looks good.