[PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Apr 15, 2011, 17:53 UTC
- Message-ID
- <4DA8862F.5070102@gmail.com>
- In-Reply-To
- <7v7have8wo.fsf@alter.siamese.dyndns.org>
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> --- 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 01db830..9d8fe0d 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
-- 1.7.3.2.msysgit.11