From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
To: git@vger.kernel.org
Cc: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Subject: [PATCH] git-cherry-pick -x works with conflicting commits
Date: Mon, 24 Mar 2008 11:41:14 +0100 [thread overview]
Message-ID: <1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com> (raw)
So this patch fixes the docs to reflect that.
Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
---
Documentation/git-cherry-pick.txt | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index f0beb41..475e168 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -29,8 +29,7 @@ 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
- picks without conflicts. Do not use this option if
+ was cherry-picked from. 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
other hand you are cherry-picking between two publicly
--
1.5.5.rc1
next reply other threads:[~2008-03-24 10:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-24 10:41 Rafael Garcia-Suarez [this message]
2008-03-24 13:55 ` [PATCH] git-cherry-pick -x works with conflicting commits Jean-Baptiste Quenot
2008-03-24 14:52 ` Rafael Garcia-Suarez
2008-03-24 18:32 ` Jean-Baptiste Quenot
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=1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com \
--to=rgarciasuarez@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).