Skip to content

Commit

Permalink
Documentation cherry-pick: Fix cut-and-paste error
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Mike Ralphson authored and Junio C Hamano committed Mar 1, 2008
1 parent a1eebfb commit 84989bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/git-cherry-pick.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 84989bd

Please sign in to comment.