Autogenerated HTML docs for v2.33.1-637-gf443b

1 files changed, 5 insertions, 25 deletions

diff --git a/git-read-tree.html b/git-read-tree.html
index 993c2cdb1..f0be92e05 100644
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -750,8 +750,7 @@ git-read-tree(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git read-tree</em> [[-m [--trivial] [--aggressive] | --reset | --prefix=&lt;prefix&gt;]

-                [-u [--exclude-per-directory=&lt;gitignore&gt;] | -i]]

-                [--index-output=&lt;file&gt;] [--no-sparse-checkout]

+                [-u | -i]] [--index-output=&lt;file&gt;] [--no-sparse-checkout]

                 (--empty | &lt;tree-ish1&gt; [&lt;tree-ish2&gt; [&lt;tree-ish3&gt;]])</pre>

 <div class="attribution">

 </div></div>

@@ -792,8 +791,9 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div>
 <dd>

 <p>

         Same as -m, except that unmerged entries are discarded instead

-        of failing. When used with <code>-u</code>, updates leading to loss of

-        working tree changes will not abort the operation.

+        of failing.  When used with <code>-u</code>, updates leading to loss of

+        working tree changes or untracked files or directories will not

+        abort the operation.

 </p>

 </dd>

 <dt class="hdlist1">

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

 </dd>

 <dt class="hdlist1">

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

-</dt>

-<dd>

-<p>

-        When running the command with <code>-u</code> and <code>-m</code> 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 <code>make</code> but before

-        running <code>make clean</code> 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 class="hdlist1">

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

 </dt>

 <dd>

@@ -1306,7 +1286,7 @@ support.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-05-04 16:14:16 PDT

+ 2021-10-14 10:10:01 PDT

 </div>

 </div>

 </body>