diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:38:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:38:56 -0700 |
| commit | 0f51322a6be0d31f299df7becad438e8edfb608b (patch) | |
| tree | ba670d0bc41048cf6f8b70b50fc130dd7e438c52 /Documentation | |
| parent | 8de43386505b503e25788f75f89802495828e6c0 (diff) | |
| parent | bea7d16e8b8248602ea033b188f862699af4b977 (diff) | |
| download | git-0f51322a6be0d31f299df7becad438e8edfb608b.tar.gz git-0f51322a6be0d31f299df7becad438e8edfb608b.tar.xz | |
Merge branch 'ss/cherry-pick-x-doc' into maint
* ss/cherry-pick-x-doc:
doc: Clarify that "cherry-pick -x" does not use "git notes"
Diffstat (limited to 'Documentation')
| -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 01db83039..9d8fe0d26 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 |