From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes"
Date: Fri, 15 Apr 2011 09:43:55 +0200 [thread overview]
Message-ID: <4DA7F73B.9050007@gmail.com> (raw)
The documentation for "cherry-pick -x" can be misread in the way that a
"git notes" object is attached to the new commit, which is not the case.
Instead, just some text is appended to the original commit message. Make this
more clear by simply using the term "remark" instead of "note".
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
Documentation/git-cherry-pick.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 01db830..5afc2b0 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -52,8 +52,8 @@ OPTIONS
-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
+ message a remark that indicates which commit this change
+ was cherry-picked from. Append the remark 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
next reply other threads:[~2011-04-15 7:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-15 7:43 Sebastian Schuberth [this message]
2011-04-15 17:12 ` [PATCH] doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes" Junio C Hamano
2011-04-15 17:53 ` [PATCHv2] doc: Clarify that "cherry-pick -x" does not use " Sebastian Schuberth
2011-04-15 22:22 ` Jay Soffian
2011-04-16 7:19 ` Sebastian Schuberth
2011-04-16 16:33 ` Junio C Hamano
2011-04-16 16:55 ` Sebastian Schuberth
2011-04-16 17:11 ` Jay Soffian
2011-04-16 17:42 ` Junio C Hamano
2011-04-17 2:39 ` Junio C Hamano
2011-04-17 7:20 ` Sebastian Schuberth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DA7F73B.9050007@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.