summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-17 08:08:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-17 08:08:47 +0000
commitf69a0a065df32be5accdda5105d54c580c21e0ee (patch)
tree50efb9461bf15dfb63908ece88678b10e0309cc6 /git-cherry-pick.txt
parentf5a9362a72a5a586926fce49c90c93a75cbad2b5 (diff)
downloadgit-htmldocs-f69a0a065df32be5accdda5105d54c580c21e0ee.tar.gz
Autogenerated HTML docs for v1.5.6.3-439-g1e10
Diffstat (limited to 'git-cherry-pick.txt')
-rw-r--r--git-cherry-pick.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index a691173ba..50fb3d5d5 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -58,14 +58,14 @@ OPTIONS
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,
- but does not make the commit. In addition, when this
- option is used, your working tree does not have to match
+ 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 working tree.
+ beginning state of your index.
+
This is useful when cherry-picking more than one commits'
-effect to your working tree in a row.
+effect to your index in a row.
-s::
--signoff::