diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:35 -0700 |
| commit | 3340f60483e4ccb74db5d0eb453396322c2962aa (patch) | |
| tree | 923ee9affb633b4e1ac45b129e763d91899e9b53 /Documentation/git-cherry-pick.txt | |
| parent | 0cb09a7e0c91725c9ac926f1b6767dce597d19dd (diff) | |
| parent | bea7d16e8b8248602ea033b188f862699af4b977 (diff) | |
| download | git-3340f60483e4ccb74db5d0eb453396322c2962aa.tar.gz | |
Merge branch 'ss/cherry-pick-x-doc'
* ss/cherry-pick-x-doc:
doc: Clarify that "cherry-pick -x" does not use "git notes"
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 01db83039f..9d8fe0d261 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -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 |