Re: Recording cherry-picked commits

"Rafael Garcia-Suarez" [off-list ref] 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"?