From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Sun, 17 Apr 2011 07:20:50 GMT
Subject: Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
Message-ID: <BANLkTink3uzx3xz5_pG6FmFctD_2W6HiCg@mail.gmail.com>
In-Reply-To: <7v39lhbnzj.fsf@alter.siamese.dyndns.org>

On Sun, Apr 17, 2011 at 04:39, Junio C Hamano <gitster@pobox.com> wrote:

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

Still, I believe it would be more consistent to do this change as part
of the CHERRY_PICK_HEAD series itself, then.

-- 
Sebastian Schuberth