* [PATCH] Documentation cherry-pick: Fix cut-and-paste error
@ 2008-02-29 17:00 mike ralphson
0 siblings, 0 replies; only message in thread
From: mike ralphson @ 2008-02-29 17:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Mike Ralphson
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
######################################################################
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-29 17:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-29 17:00 [PATCH] Documentation cherry-pick: Fix cut-and-paste error mike ralphson
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).