summaryrefslogtreecommitdiffstats
path: root/git-update-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
commit1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch)
tree72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-update-index.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-update-index.html')
-rw-r--r--git-update-index.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/git-update-index.html b/git-update-index.html
index 3411ba418..59da4e61a 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -342,7 +342,7 @@ into the index and any <em>unmerged</em> or <em>needs updating</em> state is
cleared.</p></div>
<div class="para"><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></div>
-<div class="para"><p>The way <em>git-update-index</em> handles files it is told about can be modified
+<div class="para"><p>The way <em>git update-index</em> handles files it is told about can be modified
using the various options:</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
@@ -384,7 +384,7 @@ using the various options:</p></div>
<p>
Quiet. If --refresh finds that the index needs an update, the
default behavior is to error out. This option makes
- <em>git-update-index</em> continue anyway.
+ <em>git update-index</em> continue anyway.
</p>
</dd>
<dt>
@@ -402,7 +402,7 @@ using the various options:</p></div>
<dd>
<p>
If --refresh finds unmerged changes in the index, the default
- behavior is to error out. This option makes <em>git-update-index</em>
+ behavior is to error out. This option makes <em>git update-index</em>
continue anyway.
</p>
</dd>
@@ -498,7 +498,7 @@ you will need to handle the situation manually.</p></div>
</dt>
<dd>
<p>
- Runs <em>git-update-index</em> itself on the paths whose index
+ Runs <em>git update-index</em> itself on the paths whose index
entries are different from those from the <tt>HEAD</tt> commit.
</p>
</dd>
@@ -536,7 +536,7 @@ you will need to handle the situation manually.</p></div>
<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>.
+ <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>
cannot be added. With --replace flag, existing entries
that conflict with the entry being added are
@@ -599,7 +599,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></div>
-<div class="para"><p>For example, you'd want to do this after doing a <em>git-read-tree</em>, to link
+<div class="para"><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>
<h2 id="_using_cacheinfo_or_info_only">Using --cacheinfo or --info-only</h2>
@@ -639,7 +639,7 @@ back on 3-way merge.</p></div>
<p>
mode SP type SP sha1 TAB path
</p>
-<div class="para"><p>The second format is to stuff <em>git-ls-tree</em> output
+<div class="para"><p>The second format is to stuff <em>git ls-tree</em> output
into the index file.</p></div>
</li>
<li>
@@ -647,7 +647,7 @@ into the index file.</p></div>
mode SP sha1 SP stage TAB path
</p>
<div class="para"><p>This format is to put higher order stages into the
-index file and matches <em>git-ls-files --stage</em> output.</p></div>
+index file and matches <em>git ls-files --stage</em> output.</p></div>
</li>
</ol></div>
<div class="para"><p>To place a higher stage entry to the index, the path should
@@ -698,8 +698,8 @@ option. To unset, use <tt>--no-assume-unchanged</tt>.</p></div>
<div class="para"><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
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
+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
@@ -808,7 +808,7 @@ unreliable, this should be set to <em>false</em> (see <a href="git-config.html">
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>
+need to use <em>git update-index --chmod=</em>.</p></div>
<div class="para"><p>Quite similarly, if <tt>core.symlinks</tt> 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
@@ -839,7 +839,7 @@ ctime for marking files processed) (see <a href="git-config.html">git-config(1)<
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-13 23:08:42 UTC
+Last updated 2010-01-21 17:44:39 UTC
</div>
</div>
</body>