From: Jean-Baptiste Quenot <jbq@caraldi.com>
Date: Mon, 24 Mar 2008 13:55:28 GMT
Subject: Re: [PATCH] git-cherry-pick -x works with conflicting commits
Message-ID: <ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com>
In-Reply-To: <1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com>

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?

Cheers,
-- 
Jean-Baptiste Quenot
http://caraldi.com/jbq/blog/