Autogenerated HTML docs for v1.6.1-80-g7eb5

1 files changed, 19 insertions, 1 deletions

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 66c1c5d30..73ab3c4b7 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -453,6 +453,9 @@ have all of them as parents.</p></div>
 convenience functions, too.  For example, calling <em>skip_commit "$@"</em>

 will leave out the current commit (but not its changes! If you want

 that, use <em>git-rebase</em> instead).</p></div>

+<div class="para"><p>You can also use the <em>git_commit_non_empty_tree "$@"</em> instead of

+<em>git commit-tree "$@"</em> if you don't wish to keep commits with a single parent

+and that makes no change to the tree.</p></div>

 </dd>

 <dt>

 --tag-name-filter &lt;command&gt;

@@ -491,6 +494,21 @@ to other tags will be rewritten to point to the underlying commit.</p></div>
 </p>

 </dd>

 <dt>

+--prune-empty

+</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 <em>--commit-filter</em>. Though you

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

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

+        happen.

+</p>

+</dd>

+<dt>

 --original &lt;namespace&gt;

 </dt>

 <dd>

@@ -676,7 +694,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-12-10 08:33:15 UTC

+Last updated 2009-01-11 08:16:03 UTC

 </div>

 </div>

 </body>