From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Mar 2008 00:37:10 GMT
Subject: Re: Recording cherry-picked commits
Message-ID: <7veja2gts9.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@mail.gmail.com>

"Rafael Garcia-Suarez" <rgarciasuarez@gmail.com> writes:

> Here's an alternate idea: store the original sha1 in the commit
> message, via a custom header (something like X-Cherry-Picked-From) at
> least in case of conflict, and have git-cherry recognize it.
>
> (I have the same problem as you, by the way, and would really like to
> see it solved one way or another.)

"-x"?