Autogenerated HTML docs for v1.5.1-81-gee969

1 files changed, 19 insertions, 2 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index ed0c0c653..860ef4762 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -272,7 +272,7 @@ git-read-tree(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive] | --reset | --prefix=&lt;prefix&gt;] [-u | -i]] [--exclude-per-directory=&lt;gitignore&gt;] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>

+<p><em>git-read-tree</em> (&lt;tree-ish&gt; | [[-m [--aggressive] | --reset | --prefix=&lt;prefix&gt;] [-u | -i]] [--exclude-per-directory=&lt;gitignore&gt;] [--index-output=&lt;file&gt;] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -397,6 +397,23 @@ when both sides adds a path identically.  The resolution
 </p>

 </dd>

 <dt>

+--index-output=&lt;file&gt;

+</dt>

+<dd>

+<p>

+        Instead of writing the results out to <tt>$GIT_INDEX_FILE</tt>,

+        write the resulting index in the named file.  While the

+        command is operating, the original index file is locked

+        with the same mechanism as usual.  The file must allow

+        to be rename(2)ed into from a temporary file that is

+        created next to the usual index file; typically this

+        means it needs to be on the same filesystem as the index

+        file itself, and you need write permission to the

+        directories the index file and index output file are

+        located in.

+</p>

+</dd>

+<dt>

 &lt;tree-ish#&gt;

 </dt>

 <dd>

@@ -682,7 +699,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 04-Apr-2007 18:33:58 UTC

+Last updated 07-Apr-2007 10:17:29 UTC

 </div>

 </div>

 </body>