summaryrefslogtreecommitdiffstats
path: root/git-update-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-update-index.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-update-index.html')
-rw-r--r--git-update-index.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-update-index.html b/git-update-index.html
index 708cf675e..3761288d8 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -906,7 +906,7 @@ you will need to handle the situation manually.</p></div>
</dt>
<dd>
<p>
- Like <em>--refresh</em>, but checks stat information unconditionally,
+ Like <code>--refresh</code>, but checks stat information unconditionally,
without regard to the "assume unchanged" setting.
</p>
</dd>
@@ -1104,7 +1104,7 @@ will remove the intended effect of the option.</p></div>
<div class="sect1">
<h2 id="_using_refresh">Using --refresh</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>--refresh</em> does not calculate a new sha1 file or bring the index
+<div class="paragraph"><p><code>--refresh</code> does not calculate a new sha1 file or bring the index
up-to-date for mode/content changes. But what it <strong>does</strong> do is to
"re-match" the stat information of a file with the index, so that you
can refresh the index for a file that hasn&#8217;t been changed but where
@@ -1116,7 +1116,7 @@ up the stat index details with the proper files.</p></div>
<div class="sect1">
<h2 id="_using_cacheinfo_or_info_only">Using --cacheinfo or --info-only</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>--cacheinfo</em> is used to register a file that is not in the
+<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>
@@ -1124,11 +1124,11 @@ merging.</p></div>
<div class="content">
<pre><code>$ git update-index --cacheinfo &lt;mode&gt;,&lt;sha1&gt;,&lt;path&gt;</code></pre>
</div></div>
-<div class="paragraph"><p><em>--info-only</em> is used to register files without placing them in the object
+<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>
-<div class="paragraph"><p>Both <em>--cacheinfo</em> and <em>--info-only</em> behave similarly: the index is updated
-but the object database isn&#8217;t. <em>--cacheinfo</em> is useful when the object is
-in the database but the file isn&#8217;t available locally. <em>--info-only</em> is
+<div class="paragraph"><p>Both <code>--cacheinfo</code> and <code>--info-only</code> behave similarly: the index is updated
+but the object database isn&#8217;t. <code>--cacheinfo</code> is useful when the object is
+in the database but the file isn&#8217;t available locally. <code>--info-only</code> is
useful when the file is available, but you do not wish to update the
object database.</p></div>
</div>
@@ -1395,7 +1395,7 @@ ctime for marking files processed) (see <a href="git-config.html">git-config(1)<
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-02-10 15:41:33 PST
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>