From: Mike Ralphson Date: Fri, 29 Feb 2008 17:00:38 +0000 (+0000) Subject: Documentation cherry-pick: Fix cut-and-paste error X-Git-Tag: v1.5.4.4~22 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c?hp=--cc Documentation cherry-pick: Fix cut-and-paste error Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano --- 84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 877ab66ef5..f0beb412e6 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