Autogenerated HTML docs for v1.4.4.2-g1d77

1 files changed, 22 insertions, 2 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index bc765eade..1bdc82741 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]] &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;] &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</p>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

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

 </dd>

 <dt>

+--exclude-per-directory=&lt;gitignore&gt;

+</dt>

+<dd>

+<p>

+        When running the command with <tt>-u</tt> and <tt>-m</tt> options, the

+        merge result may need to overwrite paths that are not

+        tracked in the current branch.  The command usually

+        refuses to proceed with the merge to avoid losing such a

+        path.  However this safety valve sometimes gets in the

+        way.  For example, it often happens that the other

+        branch added a file that used to be a generated file in

+        your branch, and the safety valve triggers when you try

+        to switch to that branch after you ran <tt>make</tt> but before

+        running <tt>make clean</tt> to remove the generated file.  This

+        option tells the command to read per-directory exclude

+        file (usually <em>.gitignore</em>) and allows such an untracked

+        but explicitly ignored file to be overwritten.

+</p>

+</dd>

+<dt>

 &lt;tree-ish#&gt;

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Oct-2006 08:41:20 UTC

+Last updated 13-Dec-2006 21:32:06 UTC

 </div>

 </div>

 </body>