summaryrefslogtreecommitdiffstats
path: root/git-update-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 15:32:51 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 15:32:51 -0700
commitac12f0ed6289c50e645af6dfb6e063776bc0f428 (patch)
tree9033ab4b78ce9c9122fbe9b5abcf23d596ea24fd /git-update-index.html
parentc3f8d8ffe5fd51ed0a3dae59dd8b78f61d7b43d2 (diff)
downloadgit-htmldocs-ac12f0ed6289c50e645af6dfb6e063776bc0f428.tar.gz
Autogenerated HTML docs for v2.1.1-273-g97b886
Diffstat (limited to 'git-update-index.html')
-rw-r--r--git-update-index.html108
1 files changed, 53 insertions, 55 deletions
diff --git a/git-update-index.html b/git-update-index.html
index d31de5c6a..0d7c41532 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-update-index(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p {
ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content {
}
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img {
margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] {
*
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody {
@media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<![CDATA[*/
@@ -581,7 +579,7 @@ toc: function (toclevels) {
function tocEntries(el, toclevels) {
var result = new Array;
- var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) {
var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () {
var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -897,7 +895,7 @@ using the various options:</p></div>
</p>
<div class="paragraph"><p>This option can be also used as a coarse file-level mechanism
to ignore uncommitted changes in tracked files (akin to what
-<tt>.gitignore</tt> does for untracked files).
+<code>.gitignore</code> does for untracked files).
Git will fail (gracefully) in case it needs to modify this file
in the index e.g. when merging in a commit;
thus, in case the assumed-untracked file is changed upstream,
@@ -932,7 +930,7 @@ you will need to handle the situation manually.</p></div>
<dd>
<p>
Runs <em>git update-index</em> itself on the paths whose index
- entries are different from those from the <tt>HEAD</tt> commit.
+ entries are different from those from the <code>HEAD</code> commit.
</p>
</dd>
<dt class="hdlist1">
@@ -968,9 +966,9 @@ you will need to handle the situation manually.</p></div>
</dt>
<dd>
<p>
- By default, when a file <tt>path</tt> exists in the index,
- <em>git update-index</em> refuses an attempt to add <tt>path/file</tt>.
- Similarly if a file <tt>path/file</tt> exists, a file <tt>path</tt>
+ By default, when a file <code>path</code> exists in the index,
+ <em>git update-index</em> refuses an attempt to add <code>path/file</code>.
+ Similarly if a file <code>path/file</code> exists, a file <code>path</code>
cannot be added. With --replace flag, existing entries
that conflict with the entry being added are
automatically removed with warning messages.
@@ -1002,7 +1000,7 @@ you will need to handle the situation manually.</p></div>
Write the resulting index out in the named on-disk format version.
Supported versions are 2, 3 and 4. The current default version is 2
or 3, depending on whether extra features are used, such as
- <tt>git add -N</tt>.
+ <code>git add -N</code>.
</p>
<div class="paragraph"><p>Version 4 performs a simple pathname compression that reduces index
size by 30%-50% on large repositories, which results in faster load
@@ -1015,7 +1013,7 @@ may not support it yet.</p></div>
</dt>
<dd>
<p>
- Only meaningful with <tt>--stdin</tt> or <tt>--index-info</tt>; paths are
+ Only meaningful with <code>--stdin</code> or <code>--index-info</code>; paths are
separated with NUL character instead of LF.
</p>
</dd>
@@ -1031,7 +1029,7 @@ may not support it yet.</p></div>
split into two files, $GIT_DIR/index and $GIT_DIR/sharedindex.&lt;SHA-1&gt;.
Changes are accumulated in $GIT_DIR/index while the shared
index file contains all index entries stays unchanged. If
- split-index mode is already enabled and <tt>--split-index</tt> is
+ split-index mode is already enabled and <code>--split-index</code> is
given again, all changes in $GIT_DIR/index are pushed back to
the shared index file. This mode is designed for very large
indexes that take a signficant amount of time to read or write.
@@ -1052,7 +1050,7 @@ may not support it yet.</p></div>
<p>
Files to act on.
Note that files beginning with <em>.</em> are discarded. This includes
- <tt>./file</tt> and <tt>dir/./file</tt>. If you don&#8217;t want this, then use
+ <code>./file</code> and <code>dir/./file</code>. If you don&#8217;t want this, then use
cleaner names.
The same applies to directories ending <em>/</em> and paths with <em>//</em>
</p>
@@ -1081,7 +1079,7 @@ merging.</p></div>
<div class="paragraph"><p>To pretend you have a file with mode and sha1 at path, say:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git update-index --cacheinfo mode sha1 path</tt></pre>
+<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
database. This is useful for status-only repositories.</p></div>
@@ -1095,7 +1093,7 @@ object database.</p></div>
<div class="sect1">
<h2 id="_using_index_info">Using --index-info</h2>
<div class="sectionbody">
-<div class="paragraph"><p><tt>--index-info</tt> is a more powerful mechanism that lets you feed
+<div class="paragraph"><p><code>--index-info</code> is a more powerful mechanism that lets you feed
multiple entry definitions from the standard input, and designed
specifically for scripts. It can take inputs of three formats:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -1129,16 +1127,16 @@ then feeding necessary input lines in the third format.</p></div>
<div class="paragraph"><p>For example, starting with this index:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git ls-files -s
-100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz</tt></pre>
+<pre><code>$ git ls-files -s
+100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz</code></pre>
</div></div>
-<div class="paragraph"><p>you can feed the following input to <tt>--index-info</tt>:</p></div>
+<div class="paragraph"><p>you can feed the following input to <code>--index-info</code>:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git update-index --index-info
+<pre><code>$ git update-index --index-info
0 0000000000000000000000000000000000000000 frotz
100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
-100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</tt></pre>
+100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</code></pre>
</div></div>
<div class="paragraph"><p>The first line of the input feeds 0 as the mode to remove the
path; the SHA-1 does not matter as long as it is well formatted.
@@ -1146,9 +1144,9 @@ Then the second and third line feeds stage 1 and stage 2 entries
for that path. After the above, we would end up with this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git ls-files -s
+<pre><code>$ git ls-files -s
100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
-100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</tt></pre>
+100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</code></pre>
</div></div>
</div>
</div>
@@ -1156,11 +1154,11 @@ for that path. After the above, we would end up with this:</p></div>
<h2 id="_using_8220_assume_unchanged_8221_bit">Using &#8220;assume unchanged&#8221; bit</h2>
<div class="sectionbody">
<div class="paragraph"><p>Many operations in Git depend on your filesystem to have an
-efficient <tt>lstat(2)</tt> implementation, so that <tt>st_mtime</tt>
+efficient <code>lstat(2)</code> implementation, so that <code>st_mtime</code>
information for working tree files can be cheaply checked to see
if the file contents have changed from the version recorded in
the index file. Unfortunately, some filesystems have
-inefficient <tt>lstat(2)</tt>. If your filesystem is one of them, you
+inefficient <code>lstat(2)</code>. If your filesystem is one of them, you
can set "assume unchanged" bit to paths you have not changed to
cause Git not to do this check. Note that setting this bit on a
path does not mean Git will check the contents of the file to
@@ -1168,18 +1166,18 @@ see if it has changed&#8201;&#8212;&#8201;it makes Git to omit any checking and
assume it has <strong>not</strong> changed. When you make changes to working
tree files, you have to explicitly tell Git about it by dropping
"assume unchanged" bit, either before or after you modify them.</p></div>
-<div class="paragraph"><p>In order to set "assume unchanged" bit, use <tt>--assume-unchanged</tt>
-option. To unset, use <tt>--no-assume-unchanged</tt>. To see which files
-have the "assume unchanged" bit set, use <tt>git ls-files -v</tt>
+<div class="paragraph"><p>In order to set "assume unchanged" bit, use <code>--assume-unchanged</code>
+option. To unset, use <code>--no-assume-unchanged</code>. To see which files
+have the "assume unchanged" bit set, use <code>git ls-files -v</code>
(see <a href="git-ls-files.html">git-ls-files(1)</a>).</p></div>
-<div class="paragraph"><p>The command looks at <tt>core.ignorestat</tt> configuration variable. When
-this is true, paths updated with <tt>git update-index paths...</tt> and
+<div class="paragraph"><p>The command looks at <code>core.ignorestat</code> configuration variable. When
+this is true, paths updated with <code>git update-index paths...</code> and
paths updated with other Git commands that update both index and
working tree (e.g. <em>git apply --index</em>, <em>git checkout-index -u</em>,
and <em>git read-tree -u</em>) are automatically marked as "assume
unchanged". Note that "assume unchanged" bit is <strong>not</strong> set if
-<tt>git update-index --refresh</tt> finds the working tree file matches
-the index (use <tt>git update-index --really-refresh</tt> if you want
+<code>git update-index --refresh</code> finds the working tree file matches
+the index (use <code>git update-index --really-refresh</code> if you want
to mark them as "assume unchanged").</p></div>
</div>
</div>
@@ -1189,16 +1187,16 @@ to mark them as "assume unchanged").</p></div>
<div class="paragraph"><p>To update and refresh only the files already checked out:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git checkout-index -n -f -a &amp;&amp; git update-index --ignore-missing --refresh</tt></pre>
+<pre><code>$ git checkout-index -n -f -a &amp;&amp; git update-index --ignore-missing --refresh</code></pre>
</div></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-On an inefficient filesystem with <tt>core.ignorestat</tt> set
+On an inefficient filesystem with <code>core.ignorestat</code> set
</dt>
<dd>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git update-index --really-refresh <b>&lt;1&gt;</b>
+<pre><code>$ git update-index --really-refresh <b>&lt;1&gt;</b>
$ git update-index --no-assume-unchanged foo.c <b>&lt;2&gt;</b>
$ git diff --name-only <b>&lt;3&gt;</b>
$ edit foo.c
@@ -1210,7 +1208,7 @@ $ edit foo.c
$ git diff --name-only <b>&lt;7&gt;</b>
$ git update-index --no-assume-unchanged foo.c <b>&lt;8&gt;</b>
$ git diff --name-only <b>&lt;9&gt;</b>
-M foo.c</tt></pre>
+M foo.c</code></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
@@ -1285,20 +1283,20 @@ precedence over assume-unchanged bit when both are set.</p></div>
<div class="sect1">
<h2 id="_configuration">Configuration</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The command honors <tt>core.filemode</tt> configuration variable. If
+<div class="paragraph"><p>The command honors <code>core.filemode</code> configuration variable. If
your repository is on a filesystem whose executable bits are
unreliable, this should be set to <em>false</em> (see <a href="git-config.html">git-config(1)</a>).
This causes the command to ignore differences in file modes recorded
in the index and the file mode on the filesystem if they differ only on
executable bit. On such an unfortunate filesystem, you may
need to use <em>git update-index --chmod=</em>.</p></div>
-<div class="paragraph"><p>Quite similarly, if <tt>core.symlinks</tt> configuration variable is set
+<div class="paragraph"><p>Quite similarly, if <code>core.symlinks</code> configuration variable is set
to <em>false</em> (see <a href="git-config.html">git-config(1)</a>), symbolic links are checked out
as plain files, and this command does not modify a recorded file mode
from symbolic link to regular file.</p></div>
-<div class="paragraph"><p>The command looks at <tt>core.ignorestat</tt> configuration variable. See
+<div class="paragraph"><p>The command looks at <code>core.ignorestat</code> configuration variable. See
<em>Using "assume unchanged" bit</em> section above.</p></div>
-<div class="paragraph"><p>The command also looks at <tt>core.trustctime</tt> configuration variable.
+<div class="paragraph"><p>The command also looks at <code>core.trustctime</code> configuration variable.
It can be useful when the inode change time is regularly modified by
something outside Git (file system crawlers and backup systems use
ctime for marking files processed) (see <a href="git-config.html">git-config(1)</a>).</p></div>
@@ -1322,7 +1320,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 2014-07-16 14:50:19 PDT
+Last updated 2014-09-19 15:32:09 PDT
</div>
</div>
</body>