summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMike Ralphson <mike@abacus.co.uk>2008-02-29 17:00:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-01 05:22:22 (GMT)
commit84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c (patch)
tree04e51ceab35342e7a5dcce1a2ba6b00c0320f3b9 /Documentation
parenta1eebfb3a90b6c240afd1a32cfebe6ee5dbd72c5 (diff)
downloadgit-84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c.zip
git-84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c.tar.gz
git-84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c.tar.bz2
Documentation cherry-pick: Fix cut-and-paste error
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cherry-pick.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 877ab66..f0beb41 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -45,7 +45,7 @@ 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
+ 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