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 <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth committed
Apr 15, 2011 at 19:53 UTC
bea7d16e8b8248602ea033b188f862699af4b977
1 file changed
+4
-3
Documentation/git-cherry-pick.txt
+4
-3
@@ -32,9 +32,10 @@ OPTIONS
32
message prior to committing.
33
34
-x::
35
- When recording the commit, append to the original commit
36
- message a note that indicates which commit this change
37
- was cherry-picked from. Append the note only for cherry
35
+ When recording the commit, append a line that says
36
+ "(cherry picked from commit ...)" to the original commit
37
+ message in order to indicate which commit this change was
38
+ cherry-picked from. This is done only for cherry
39
picks without conflicts. Do not use this option if
40
you are cherry-picking from your private branch because
41
the information is useless to the recipient. If on the