Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Apr 16, 2011, 07:19 UTC
- Message-ID
- <BANLkTi=jr0hkmBUGj7tHURSj5XiJkyyQqg@mail.gmail.com>
- In-Reply-To
- <BANLkTi=HecmdGbEX5inqUi4FZ5Ty+L1Ybg@mail.gmail.com>
On Sat, Apr 16, 2011 at 00:22, Jay Soffian <jaysoffian@gmail.com> wrote:
Show 14 quoted lines
>> -x:: >> - When recording the commit, append to the original commit >> - message a note that indicates which commit this change >> - was cherry-picked from. Append the note only for cherry >> + When recording the commit, append a line that says >> + "(cherry picked from commit ...)" to the original commit >> + message in order to indicate which commit this change was >> + 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 > > As long as you're nearby, "This is done only for cherry picks without > conflicts." can be dropped. It's no longer true.
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.
-- Sebastian Schuberth