[PATCH] doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes"
From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:51:02
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- 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