Autogenerated HTML docs for v2.21.0-135-g6e0cc

1 files changed, 15 insertions, 1 deletions

diff --git a/git-checkout.html b/git-checkout.html
index ca02c3da7..be664e4cd 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -1102,6 +1102,8 @@ the conflicted merge in the specified paths.</p></div>
 <div class="paragraph"><p>This means that you can use <code>git checkout -p</code> to selectively discard

 edits from your current working tree. See the &#8220;Interactive Mode&#8221;

 section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p></div>

+<div class="paragraph"><p>Note that this option uses the no overlay mode by default (see also

+<code>--[no-]overlay</code>), and currently doesn&#8217;t support overlay mode.</p></div>

 </dd>

 <dt class="hdlist1">

 --ignore-other-worktrees

@@ -1138,6 +1140,18 @@ section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <co
 </p>

 </dd>

 <dt class="hdlist1">

+--[no-]overlay

+</dt>

+<dd>

+<p>

+        In the default overlay mode, <code>git checkout</code> never

+        removes files from the index or the working tree.  When

+        specifying <code>--no-overlay</code>, files that appear in the index and

+        working tree, but not in &lt;tree-ish&gt; are removed, to make them

+        match &lt;tree-ish&gt; exactly.

+</p>

+</dd>

+<dt class="hdlist1">

 &lt;branch&gt;

 </dt>

 <dd>

@@ -1454,7 +1468,7 @@ $ git add frotz</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-02-24 08:31:33 PST

+ 2019-03-07 12:16:20 JST

 </div>

 </div>

 </body>