Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs

Jay Soffian <jaysoffian@gmail.com> writes:

Well, it is not.

Shawn might have accepted a documentation patch as such during my absence, but when I originally wrote the "cherry-picked-from", it was a conscious design decision not to carry the information forward in a conflicted case, and the reasoning was exactly what you wrote in your first response.

Because -x has become an optional feature that a user has to explicitly ask, I however tend to agree with Uwe that it may make sense to throw the original commit object name in the commit log template these days. That would allow the user to edit it further and say something like "Originally done by Foo in commit 1234, forward ported with conflict resolution."