Autogenerated HTML docs for v1.7.10-420-g9768c

1 files changed, 30 insertions, 1 deletions

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 54b7f1857..0d7516ecc 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -747,6 +747,35 @@ effect to your index in a row.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--allow-empty

+</dt>

+<dd>

+<p>

+        By default, cherry-picking an empty commit will fail,

+        indicating that an explicit invocation of <tt>git commit

+        --allow-empty</tt> is required. This option overrides that

+        behavior, allowing empty commits to be preserved automatically

+        in a cherry-pick. Note that when "--ff" is in effect, empty

+        commits that meet the "fast-forward" requirement will be kept

+        even without this option.  Note also, that use of this option only

+        keeps commits that were initially empty (i.e. the commit recorded the

+        same tree as its parent).  Commits which are made empty due to a

+        previous commit are dropped.  To force the inclusion of those commits

+        use <tt>--keep-redundant-commits</tt>.

+</p>

+</dd>

+<dt class="hdlist1">

+--keep-redundant-commits

+</dt>

+<dd>

+<p>

+        If a commit being cherry picked duplicates a commit already in the

+        current history, it will become empty.  By default these

+        redundant commits are ignored.  This option overrides that behavior and

+        creates an empty commit object.  Implies <tt>--allow-empty</tt>.

+</p>

+</dd>

+<dt class="hdlist1">

 --strategy=&lt;strategy&gt;

 </dt>

 <dd>

@@ -924,7 +953,7 @@ context lines.
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-30 12:46:15 PDT

+Last updated 2012-04-30 15:35:49 PDT

 </div>

 </div>

 </body>