From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Apr 2011 02:39:12 GMT
Subject: Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
Message-ID: <7v39lhbnzj.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vaafqay9f.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> 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.
> ...

So to conclude,...

>> +       cherry-picked from.  This is done only for cherry
>>        picks without conflicts.  Do not use this option if
>>        you are cherry-picking from your private branch because
>>        the information is useless to the recipient.  If on the

... we could just remove the "This is done only for cherry picks without
conflicts."  We could explain that the user may want to remove the line
depending on the nature of the conflict resolution, but I guess it can
be left without saying.