mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/cherry-pick-x-doc'

Browse Source 
* ss/cherry-pick-x-doc:
  doc: Clarify that "cherry-pick -x" does not use "git notes"
This commit is contained in:
Junio C Hamano
2011-05-04 15:51:35 -07:00
parent 0cb09a7e0c bea7d16e8b
commit 3340f60483
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-cherry-pick.txt
View File

@ -51,9 +51,10 @@ OPTIONS
message prior to committing. message prior to committing.
-x:: -x::
When recording the commit, append to the original commit When recording the commit, append a line that says
message a note that indicates which commit this change "(cherry picked from commit ...)" to the original commit
was cherry-picked from. Append the note only for cherry 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 picks without conflicts. Do not use this option if
you are cherry-picking from your private branch because you are cherry-picking from your private branch because
the information is useless to the recipient. If on the the information is useless to the recipient. If on the