From: mike ralphson <mike@abacus.co.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Mike Ralphson <mike@abacus.co.uk>
Subject: [PATCH] Documentation cherry-pick: Fix cut-and-paste error
Date: Fri, 29 Feb 2008 17:00:38 +0000 [thread overview]
Message-ID: <12043044382624-git-send-email-mike@abacus.co.uk> (raw)
From: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
---
Documentation/git-cherry-pick.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 877ab66..7e59ab4 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -45,9 +45,9 @@ OPTIONS
default is not to do `-x` so this option is a no-op.
-m parent-number|--mainline parent-number::
- Usually you cannot revert a merge because you do not know which
- side of the merge should be considered the mainline. This
- option specifies the parent number (starting from 1) of
+ Usually you cannot cherry-pick a merge because you do not know
+ which side of the merge should be considered the mainline.
+ This option specifies the parent number (starting from 1) of
the mainline and allows cherry-pick to replay the change
relative to the specified parent.
--
1.5.3
######################################################################
This is an e-mail from Abacus Group plc.
Its contents, including any attachments, are confidential to the
intended recipient at the e-mail address to which it has been
addressed. If you are not the intended recipient you must not use,
disclose, distribute, copy, or print this e-mail.
If you receive this e-mail in error, please notify the sender by reply
e-mail and delete and destroy the message.
All intellectual property rights and materials contained within this
e-mail are the property of Abacus Group PLC.
Abacus Group PLC monitors e-mails to ensure its systems operate
effectively and to minimise the risk of viruses. Whilst it has taken
reasonable steps to scan this email, it does not accept liability for
any virus that may be contained in it.
Visit us online at www.abacus-group.co.uk
English Reg No. 2278260 - Abacus Group plc
######################################################################
reply other threads:[~2008-02-29 17:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=12043044382624-git-send-email-mike@abacus.co.uk \
--to=mike@abacus.co.uk \
--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 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).