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>
Mike Ralphson committed
Feb 29, 2008 at 17:00 UTC
84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c
1 file changed
+1
-1
Documentation/git-cherry-pick.txt
+1
-1
@@ -45,7 +45,7 @@ OPTIONS
45
default is not to do `-x` so this option is a no-op.
46
47
-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
49
side of the merge should be considered the mainline. This
50
option specifies the parent number (starting from 1) of
51
the mainline and allows cherry-pick to replay the change