summaryrefslogtreecommitdiffstats
path: root/git-update-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-update-index.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-update-index.html')
-rw-r--r--git-update-index.html28
1 files changed, 14 insertions, 14 deletions
diff --git a/git-update-index.html b/git-update-index.html
index 30c972e5a..cc6b77816 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -273,7 +273,7 @@ git-update-index(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-update-index</em>
+<div class="content"><em>git update-index</em>
[--add] [--remove | --force-remove] [--replace]
[--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo &lt;mode&gt; &lt;object&gt; &lt;file&gt;]*
@@ -293,7 +293,7 @@ into the index and any <em>unmerged</em> or <em>needs updating</em> state is
cleared.</p>
<p>See also <a href="git-add.html">git-add(1)</a> for a more user-friendly way to do some of
the most common operations on the index.</p>
-<p>The way "git-update-index" handles files it is told about can be modified
+<p>The way <tt>git-update-index</tt> handles files it is told about can be modified
using the various options:</p>
</div>
<h2>OPTIONS</h2>
@@ -335,7 +335,7 @@ using the various options:</p>
<p>
Quiet. If --refresh finds that the index needs an update, the
default behavior is to error out. This option makes
- git-update-index continue anyway.
+ <tt>git-update-index</tt> continue anyway.
</p>
</dd>
</dl>
@@ -349,7 +349,7 @@ using the various options:</p>
<dd>
<p>
If --refresh finds unmerged changes in the index, the default
- behavior is to error out. This option makes git-update-index
+ behavior is to error out. This option makes <tt>git-update-index</tt>
continue anyway.
</p>
</dd>
@@ -451,7 +451,7 @@ using the various options:</p>
<dd>
<p>
By default, when a file <tt>path</tt> exists in the index,
- git-update-index refuses an attempt to add <tt>path/file</tt>.
+ <tt>git-update-index</tt> refuses an attempt to add <tt>path/file</tt>.
Similarly if a file <tt>path/file</tt> exists, a file <tt>path</tt>
cannot be added. With --replace flag, existing entries
that conflicts with the entry being added are
@@ -514,7 +514,7 @@ 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't been changed but where
the stat entry is out of date.</p>
-<p>For example, you'd want to do this after doing a "git-read-tree", to link
+<p>For example, you'd want to do this after doing a <tt>git-read-tree</tt>, to link
up the stat index details with the proper files.</p>
</div>
<h2>Using --cacheinfo or --info-only</h2>
@@ -525,7 +525,7 @@ merging.</p>
<p>To pretend you have a file with mode and sha1 at path, say:</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git-update-index --cacheinfo mode sha1 path</tt></pre>
+<pre><tt>$ git update-index --cacheinfo mode sha1 path</tt></pre>
</div></div>
<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>
@@ -554,7 +554,7 @@ back on 3-way merge.</p>
<p>
mode SP type SP sha1 TAB path
</p>
-<p>The second format is to stuff git-ls-tree output
+<p>The second format is to stuff <tt>git-ls-tree</tt> output
into the index file.</p>
</li>
<li>
@@ -562,7 +562,7 @@ into the index file.</p>
mode SP sha1 SP stage TAB path
</p>
<p>This format is to put higher order stages into the
-index file and matches git-ls-files --stage output.</p>
+index file and matches <tt>git-ls-files --stage</tt> output.</p>
</li>
</ol>
<p>To place a higher stage entry to the index, the path should
@@ -611,13 +611,13 @@ tree files, you have to explicitly tell git about it by dropping
<p>In order to set "assume unchanged" bit, use <tt>--assume-unchanged</tt>
option. To unset, use <tt>--no-assume-unchanged</tt>.</p>
<p>The command looks at <tt>core.ignorestat</tt> configuration variable. When
-this is true, paths updated with <tt>git-update-index paths&#8230;</tt> and
+this is true, paths updated with <tt>git update-index paths&#8230;</tt> and
paths updated with other git commands that update both index and
working tree (e.g. <tt>git-apply --index</tt>, <tt>git-checkout-index -u</tt>,
and <tt>git-read-tree -u</tt>) 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
+<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
to mark them as "assume unchanged").</p>
</div>
<h2>Examples</h2>
@@ -625,7 +625,7 @@ to mark them as "assume unchanged").</p>
<p>To update and refresh only the files already checked out:</p>
<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><tt>$ git checkout-index -n -f -a &amp;&amp; git update-index --ignore-missing --refresh</tt></pre>
</div></div>
<dl>
<dt>
@@ -733,7 +733,7 @@ from symbolic link to regular file.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:47:03 UTC
+Last updated 02-Jul-2008 03:02:06 UTC
</div>
</div>
</body>