Autogenerated HTML docs for v1.5.2.2-249-g45fd

1 files changed, 13 insertions, 2 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index d1d94ba6c..ec7470ca1 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;] [--index-output=&lt;file&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 [--trivial] [--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">

@@ -333,6 +333,17 @@ will be in unmerged state when <tt>git-read-tree</tt> returns.</p>
 </p>

 </dd>

 <dt>

+--trivial

+</dt>

+<dd>

+<p>

+        Restrict three-way merge by <tt>git-read-tree</tt> to happen

+        only if there is no file-level merging required, instead

+        of resolving merge for trivial cases and leaving

+        conflicting files unresolved in the index.

+</p>

+</dd>

+<dt>

 --aggressive

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 16-Jun-2007 09:49:16 UTC

+Last updated 21-Jun-2007 00:34:59 UTC

 </div>

 </div>

 </body>