mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ss/cherry-pick-x-doc'
* ss/cherry-pick-x-doc: doc: Clarify that "cherry-pick -x" does not use "git notes"
This commit is contained in:
commit
3340f60483
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue