undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation cherry-pick: Fix cut-and-paste error

Browse Source 
Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Ralphson 2008-02-29 17:00:38 +00:00 committed by Junio C Hamano
parent a1eebfb3a9
commit 84989bd820
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-cherry-pick.txt
View File

@ -45,7 +45,7 @@ OPTIONS
default is not to do `-x` so this option is a no-op. default is not to do `-x` so this option is a no-op.
-m parent-number|--mainline parent-number:: -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 side of the merge should be considered the mainline. This
option specifies the parent number (starting from 1) of option specifies the parent number (starting from 1) of
the mainline and allows cherry-pick to replay the change the mainline and allows cherry-pick to replay the change