Skip to content

Commit bea7d16

Browse files
sschuberthgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 810cae5 commit bea7d16

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Documentation/git-cherry-pick.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ OPTIONS
3232
message prior to committing.
3333

3434
-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
3839
picks without conflicts. Do not use this option if
3940
you are cherry-picking from your private branch because
4041
the information is useless to the recipient. If on the

0 commit comments

Comments
 (0)