diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
| commit | 9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (patch) | |
| tree | 23257b9801739fd96c9e82ef98a17500dce9f88e /git-update-index.html | |
| parent | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff) | |
| download | git-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-update-index.html')
| -rw-r--r-- | git-update-index.html | 476 |
1 files changed, 331 insertions, 145 deletions
diff --git a/git-update-index.html b/git-update-index.html index de779df09..8e32debe7 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -2,15 +2,25 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-update-index(1)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
}
body {
@@ -35,13 +45,8 @@ strong { color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 { h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p { ul, ol, li > p {
margin-top: 0;
}
+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;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div { margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
div.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref { min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#toctitle {
color: #527bbd;
- font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
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;
}
@@ -373,69 +369,173 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+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
+ *
+ * */
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-h2 {
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
border-style: none;
}
-div.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
+}
+body.manpage div.sectionbody {
+ margin-left: 3em;
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+@media print {
+ body.manpage div#toc { display: none; }
+}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ 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).
@@ -497,6 +597,25 @@ toc: function (toclevels) { }
var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
@@ -524,24 +643,44 @@ toc: function (toclevels) { */
footnotes: function () {
- var cont = document.getElementById("content");
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () { }
}
}
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
}
}
+asciidoc.install();
/*]]>*/
</script>
</head>
-<body>
+<body class="manpage">
<div id="header">
<h1>
git-update-index(1) Manual Page
@@ -580,10 +742,11 @@ git-update-index(1) Manual Page </div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git update-index</em>
+<pre class="content"><em>git update-index</em>
[--add] [--remove | --force-remove] [--replace]
[--refresh] [-q] [--unmerged] [--ignore-missing]
[(--cacheinfo <mode> <object> <file>)…]
@@ -595,10 +758,12 @@ git-update-index(1) Manual Page [--info-only] [--index-info]
[-z] [--stdin] [--index-version <n>]
[--verbose]
- [--] [<file>…]</div>
-<div class="verseblock-attribution">
+ [--] [<file>…]</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Modifies the index or directory cache. Each file mentioned is updated
@@ -609,6 +774,8 @@ the most common operations on the index.</p></div> <div class="paragraph"><p>The way <em>git update-index</em> handles files it is told about can be modified
using the various options:</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -723,7 +890,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,
@@ -761,7 +928,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">
@@ -797,9 +964,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.
@@ -837,7 +1004,7 @@ you will need to handle the situation manually.</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>
@@ -856,13 +1023,15 @@ you will need to handle the situation manually.</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’t want this, then use
+ <code>./file</code> and <code>dir/./file</code>. If you don’t want this, then use
cleaner names.
The same applies to directories ending <em>/</em> and paths with <em>//</em>
</p>
</dd>
</dl></div>
</div>
+</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
@@ -873,6 +1042,8 @@ the stat entry is out of date.</p></div> <div class="paragraph"><p>For example, you’d want to do this after doing a <em>git read-tree</em>, to link
up the stat index details with the proper files.</p></div>
</div>
+</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
@@ -881,7 +1052,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 mode sha1 path</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>
@@ -891,9 +1062,11 @@ in the database but the file isn’t available locally. <em>--info-only</em useful when the file is available, but you do not wish to update the
object database.</p></div>
</div>
+</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">
@@ -927,16 +1100,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 SHA1 does not matter as long as it is well formatted.
@@ -944,19 +1117,21 @@ 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>
+<div class="sect1">
<h2 id="_using_8220_assume_unchanged_8221_bit">Using “assume unchanged” 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
@@ -964,35 +1139,37 @@ see if it has changed — 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>
+<div class="sect1">
<h2 id="_examples">Examples</h2>
<div class="sectionbody">
<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 && git update-index --ignore-missing --refresh</tt></pre>
+<pre><code>$ git checkout-index -n -f -a && 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><1></b>
+<pre><code>$ git update-index --really-refresh <b><1></b>
$ git update-index --no-assume-unchanged foo.c <b><2></b>
$ git diff --name-only <b><3></b>
$ edit foo.c
@@ -1004,7 +1181,7 @@ $ edit foo.c $ git diff --name-only <b><7></b>
$ git update-index --no-assume-unchanged foo.c <b><8></b>
$ git diff --name-only <b><9></b>
-M foo.c</tt></pre>
+M foo.c</code></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
@@ -1056,6 +1233,8 @@ now it checks with lstat(2) and finds it has been changed. </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_skip_worktree_bit">Skip-worktree bit</h2>
<div class="sectionbody">
<div class="paragraph"><p>Skip-worktree bit can be defined in one (long) sentence: When reading
@@ -1073,37 +1252,44 @@ working directory version matches index version)</p></div> different from assume-unchanged bit’s. Skip-worktree also takes
precedence over assume-unchanged bit when both are set.</p></div>
</div>
+</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>
</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-config.html">git-config(1)</a>,
<a href="git-add.html">git-add(1)</a>,
<a href="git-ls-files.html">git-ls-files(1)</a></p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
|