Autogenerated HTML docs for v2.12.0-306-g4a9b9

1 files changed, 7 insertions, 9 deletions

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 8b46c4329..7e8a388fd 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -942,14 +942,12 @@ to other tags will be rewritten to point to the underlying commit.</p></div>
 </dt>

 <dd>

 <p>

-        Some kind of filters will generate empty commits, that left the tree

-        untouched.  This switch allow git-filter-branch to ignore such

-        commits.  Though, this switch only applies for commits that have one

-        and only one parent, it will hence keep merges points. Also, this

-        option is not compatible with the use of <code>--commit-filter</code>. Though you

-        just need to use the function <em>git_commit_non_empty_tree "$@"</em> instead

-        of the <code>git commit-tree "$@"</code> idiom in your commit filter to make that

-        happen.

+        Some filters will generate empty commits that leave the tree untouched.

+        This option instructs git-filter-branch to remove such commits if they

+        have exactly one or zero non-pruned parents; merge commits will

+        therefore remain intact.  This option cannot be used together with

+        <code>--commit-filter</code>, though the same effect can be achieved by using the

+        provided <code>git_commit_non_empty_tree</code> function in a commit filter.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1281,7 +1279,7 @@ The <a href="http://rtyley.github.io/bfg-repo-cleaner/#examples">command options
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2016-07-13 14:58:50 PDT

+Last updated 2017-03-14 16:32:35 PDT

 </div>

 </div>

 </body>