Skip to content

Commit 84989bd

Browse files
MikeRalphsongitster
authored andcommitted
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>
1 parent a1eebfb commit 84989bd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-cherry-pick.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ OPTIONS
4545
default is not to do `-x` so this option is a no-op.
4646

4747
-m parent-number|--mainline parent-number::
48-
Usually you cannot revert a merge because you do not know which
48+
Usually you cannot cherry-pick a merge because you do not know which
4949
side of the merge should be considered the mainline. This
5050
option specifies the parent number (starting from 1) of
5151
the mainline and allows cherry-pick to replay the change

0 commit comments

Comments
 (0)