From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Mon, 24 Mar 2008 14:52:57 GMT
Subject: Re: [PATCH] git-cherry-pick -x works with conflicting commits
Message-ID: <b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com>
In-Reply-To: <ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com>

On 24/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> When I'm using "git commit -c <id>" as suggested by git-cherry-pick
>  upon conflict, I do not get the mention "(cherry picked from commit
>  <id>)", at least with version 1.5.4.1.  How did you get it?

I use the most recent git from master, and simply do git-add and
git-commit without arguments after having resolving the conflict. The
commit message in MERGE_MSG, that I checked, does have the "cherry
picked from commit <id>" mention (before the conflict list).