Autogenerated HTML docs for v2.19.0-rc0

1 files changed, 11 insertions, 14 deletions

diff --git a/git-update-index.html b/git-update-index.html
index 2ca88dbac..7a1e454b5 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -1150,10 +1150,10 @@ up the stat index details with the proper files.</p></div>
 <div class="paragraph"><p><code>--cacheinfo</code> is used to register a file that is not in the

 current working directory.  This is useful for minimum-checkout

 merging.</p></div>

-<div class="paragraph"><p>To pretend you have a file with mode and sha1 at path, say:</p></div>

+<div class="paragraph"><p>To pretend you have a file at path with mode and sha1, say:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git update-index --cacheinfo &lt;mode&gt;,&lt;sha1&gt;,&lt;path&gt;</code></pre>

+<pre><code>$ git update-index --add --cacheinfo &lt;mode&gt;,&lt;sha1&gt;,&lt;path&gt;</code></pre>

 </div></div>

 <div class="paragraph"><p><code>--info-only</code> is used to register files without placing them in the object

 database.  This is useful for status-only repositories.</p></div>

@@ -1173,19 +1173,9 @@ specifically for scripts.  It can take inputs of three formats:</p></div>
 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-mode         SP sha1          TAB path

-</p>

-<div class="paragraph"><p>The first format is what "git-apply --index-info"

-reports, and used to reconstruct a partial tree

-that is used for phony merge base tree when falling

-back on 3-way merge.</p></div>

-</li>

-<li>

-<p>

 mode SP type SP sha1          TAB path

 </p>

-<div class="paragraph"><p>The second format is to stuff <em>git ls-tree</em> output

-into the index file.</p></div>

+<div class="paragraph"><p>This format is to stuff <code>git ls-tree</code> output into the index.</p></div>

 </li>

 <li>

 <p>

@@ -1194,6 +1184,13 @@ mode         SP sha1 SP stage TAB path
 <div class="paragraph"><p>This format is to put higher order stages into the

 index file and matches <em>git ls-files --stage</em> output.</p></div>

 </li>

+<li>

+<p>

+mode         SP sha1          TAB path

+</p>

+<div class="paragraph"><p>This format is no longer produced by any Git command, but is

+and will continue to be supported by <code>update-index --index-info</code>.</p></div>

+</li>

 </ol></div>

 <div class="paragraph"><p>To place a higher stage entry to the index, the path should

 first be removed by feeding a mode=0 entry for the path, and

@@ -1496,7 +1493,7 @@ ctime for marking files processed) (see <a href="git-config.html">git-config(1)<
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-05-23 00:06:29 PDT

+ 2018-08-20 13:12:02 PDT

 </div>

 </div>

 </body>