Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"

Jay Soffian [off-list ref] writes:

Disagree. Here was my thought process (it was a conscious decision):
after conflict, when the user runs "git commit", the message is
brought up in the editor, leaving it up to the user to decide whether
it is appropriate to remove the "cherry-picked from" message. I
personally think it is correct to keept it, along with the list of
"Conflicts:".

I agree that the user can decide to remove that line in the editor when
the necessary conflict resolution was so extensive that the most part of
the original change became irrelevant.

It requires extra work that was unnecessary to the end user before the
series, and the series is a regression in that sense. But removing a
single extra line is much easier to do than adding the line from scratch,
so this particular potential regression is not really a big deal.