summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-11-24 05:38:55 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-11-24 05:38:55 +0000
commit8dae8cd6320cf439296b886b64ea2c618899069b (patch)
treea1fa39b3bfbd847cf42eb2947af56430e7db3966 /git-cherry-pick.html
parent50819852ad0116eb701bcb146878aac0b62fb6c4 (diff)
downloadgit-htmldocs-8dae8cd6320cf439296b886b64ea2c618899069b.tar.gz
Autogenerated HTML docs for v1.6.0.4-771-gef3b3
Diffstat (limited to 'git-cherry-pick.html')
-rw-r--r--git-cherry-pick.html15
1 files changed, 7 insertions, 8 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 22c7b126a..fb22e5cf5 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -404,13 +404,12 @@ modifications from the HEAD commit).</p></div>
</dt>
<dd>
<p>
- 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.
</p>
<div class="para"><p>This is useful when cherry-picking more than one commits'
@@ -443,7 +442,7 @@ effect to your index in a row.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-10-31 11:28:23 UTC
+Last updated 2008-11-24 05:38:47 UTC
</div>
</div>
</body>