On Fri, Apr 15, 2011 at 1:53 PM, Sebastian Schuberth <sschuberth@xxxxxxxxx> wrote: > The documentation for "cherry-pick -x" could be misread in the way that a > "git notes" object is attached to the new commit, which is not the case. > > Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx> > --- > ÂDocumentation/git-cherry-pick.txt | Â Â7 ++++--- > Â1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt > index 01db830..9d8fe0d 100644 > --- a/Documentation/git-cherry-pick.txt > +++ b/Documentation/git-cherry-pick.txt > @@ -51,9 +51,10 @@ OPTIONS > Â Â Â Âmessage prior to committing. > > Â-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. j. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html