From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Apr 2011 16:33:42 GMT
Subject: Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
Message-ID: <7vk4eub1g9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTi=jr0hkmBUGj7tHURSj5XiJkyyQqg@mail.gmail.com>

Sebastian Schuberth <sschuberth@gmail.com> writes:

> How can this be not true anymore? If you get a conflict while picking,
> you're asked to resolve the conflict and then commit via "git commit
> -c <picked_sha1>". Doing so will *not* give you the mentioned "(cherry
> picked from commit ...)" line.

I suspect Jay had the recent CHERRY_PICK_HEAD series that lets you omit
saying "-c <picked>" in mind.  We should not leave the cherry-picked from
in such a case, I think, but the new code may be buggy.