diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-04-15 19:53:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:53:00 -0700 |
| commit | bea7d16e8b8248602ea033b188f862699af4b977 (patch) | |
| tree | adeb0aac49d7074f2d6729bd95049f59e04c2557 /Documentation/git-cherry-pick.txt | |
| parent | 810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff) | |
| download | git-bea7d16e8b8248602ea033b188f862699af4b977.tar.gz | |
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 <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 73008705eb..6ba3230401 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -32,9 +32,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 |