Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: Clarify that "cherry-pick -x" does not use "git notes"
author
Sebastian Schuberth
<sschuberth@gmail.com>
Fri, 15 Apr 2011 17:53:51 +0000
(19:53 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Apr 2011 20:53:00 +0000
(13:53 -0700)
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>
Documentation/git-cherry-pick.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
810cae5
)
diff --git
a/Documentation/git-cherry-pick.txt
b/Documentation/git-cherry-pick.txt
index 73008705ebe304c8d2a2d089e9328be369c50fc6..6ba323040138576cc07e5d27608ab8758eea13fc 100644
(file)
--- a/
Documentation/git-cherry-pick.txt
+++ b/
Documentation/git-cherry-pick.txt
@@
-32,9
+32,10
@@
OPTIONS
message prior to committing.
-x::
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
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