From: Sebastian Schuberth Date: Fri, 15 Apr 2011 17:53:51 +0000 (+0200) Subject: doc: Clarify that "cherry-pick -x" does not use "git notes" X-Git-Tag: v1.7.5.2~4^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bea7d16e8b8248602ea033b188f862699af4b977;p=git.git doc: Clarify that "cherry-pick -x" does not use "git notes" 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 73008705e..6ba323040 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -32,9 +32,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