summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.html
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.html
parentf5a9362a72a5a586926fce49c90c93a75cbad2b5 (diff)
downloadgit-htmldocs-f69a0a065df32be5accdda5105d54c580c21e0ee.tar.gz
Autogenerated HTML docs for v1.5.6.3-439-g1e10
Diffstat (limited to 'git-cherry-pick.html')
-rw-r--r--git-cherry-pick.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 79e62bb76..163a825de 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -407,14 +407,14 @@ modifications from the HEAD commit).</p></div>
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.
</p>
<div class="para"><p>This is useful when cherry-picking more than one commits'
-effect to your working tree in a row.</p></div>
+effect to your index in a row.</p></div>
</dd>
<dt>
-s
@@ -443,7 +443,7 @@ effect to your working tree in a row.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:38 UTC
+Last updated 2008-07-17 08:08:28 UTC
</div>
</div>
</body>