Fix misleading wording for git-cherry-pick
Documentation for -n implies that -x is normally used, however this is no longer true. Signed-off-by: Bryan Drewery <bryan@shatow.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bryan Drewery committed
Nov 19, 2008 at 23:11 UTC
37a7744ffe31af785571858f7341d588a6c66784
1 file changed
+6
-7
Documentation/git-cherry-pick.txt
+6
-7
@@ -55,13 +55,12 @@ OPTIONS
55
56
-n::
57
--no-commit::
58
- Usually the command automatically creates a commit with
59
- a commit log message stating which commit was
60
- cherry-picked. This flag applies the change necessary
61
- to cherry-pick the named commit to your working tree
62
- and the index, but does not make the commit. In addition,
63
- when this option is used, your index does not have to match
64
- the HEAD commit. The cherry-pick is done against the
58
+ Usually the command automatically creates a commit.
59
+ This flag applies the change necessary to cherry-pick
60
+ the named commit to your working tree and the index,
61
+ but does not make the commit. In addition, when this
62
+ option is used, your index does not have to match the
63
+ HEAD commit. The cherry-pick is done against the
64
beginning state of your index.
65
+
66
This is useful when cherry-picking more than one commits'