Autogenerated HTML docs for v1.7.0.3-311-g6a6955

1 files changed, 12 insertions, 2 deletions

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 7b8ff9d84..3869be75b 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -320,7 +320,7 @@ git-cherry-pick(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<div class="para"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] &lt;commit&gt;</p></div>

+<div class="para"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;</p></div>

 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

@@ -426,6 +426,16 @@ effect to your index in a row.</p></div>
         Add Signed-off-by line at the end of the commit message.

 </p>

 </dd>

+<dt>

+--ff

+</dt>

+<dd>

+<p>

+        If the current HEAD is the same as the parent of the

+        cherry-pick'ed commit, then a fast forward to this commit will

+        be performed.

+</p>

+</dd>

 </dl></div>

 </div>

 <h2 id="_author">Author</h2>

@@ -442,7 +452,7 @@ effect to your index in a row.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-02-13 00:59:36 UTC

+Last updated 2010-03-29 07:49:09 UTC

 </div>

 </div>

 </body>