summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorBryan Drewery <bryan@shatow.net>2008-11-19 23:11:42 -0600
committerJunio C Hamano <gitster@pobox.com>2008-11-23 19:32:39 -0800
commit37a7744ffe31af785571858f7341d588a6c66784 (patch)
tree6ac7e3b302b3f1d13ba8b7bac4c535d894aeab41 /Documentation/git-cherry-pick.txt
parent3eb91bfc0d2e0c8c67bd4ec62523deb849919dd9 (diff)
downloadgit-37a7744ffe31af785571858f7341d588a6c66784.tar.gz
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>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
-rw-r--r--Documentation/git-cherry-pick.txt13
1 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 837fb08b79..b764130d26 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -55,13 +55,12 @@ OPTIONS
-n::
--no-commit::
- Usually the command automatically creates a commit with
- a commit log message stating which commit was
- cherry-picked. This flag applies the change necessary
- to cherry-pick the named commit to your working tree
- and the index, but does not make the commit. In addition,
- when this option is used, your index does not have to match
- the HEAD commit. The cherry-pick is done against the
+ Usually the command automatically creates a commit.
+ This flag applies the change necessary to cherry-pick
+ the named commit to your working tree and the index,
+ but does not make the commit. In addition, when this
+ option is used, your index does not have to match the
+ HEAD commit. The cherry-pick is done against the
beginning state of your index.
+
This is useful when cherry-picking more than one commits'