summaryrefslogtreecommitdiffstats
path: root/git-update-index.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-12-20 06:30:11 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-12-20 06:30:11 +0000
commit54bf1e2728abed073b4c0bd79830af6cdbcc67fe (patch)
tree4f813eacc91b38b7503eb07e830984d3a8b187ce /git-update-index.html
parent6a3c82713a6d40b17cafd5a3eb312fe7b25d277e (diff)
downloadgit-htmldocs-54bf1e2728abed073b4c0bd79830af6cdbcc67fe.tar.gz
Autogenerated HTML docs for v1.6.1-rc3-51-g5832d
Diffstat (limited to 'git-update-index.html')
-rw-r--r--git-update-index.html20
1 files changed, 12 insertions, 8 deletions
diff --git a/git-update-index.html b/git-update-index.html
index 12f699923..d5a139b6f 100644
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -386,11 +386,15 @@ using the various options:</p></div>
<em>git-update-index</em> continue anyway.
</p>
</dd>
-</dl></div>
-<div class="para"><p>--ignore-submodules:
+<dt>
+--ignore-submodules
+</dt>
+<dd>
+<p>
Do not try to update submodules. This option is only respected
- when passed before --refresh.</p></div>
-<div class="vlist"><dl>
+ when passed before --refresh.
+</p>
+</dd>
<dt>
--unmerged
</dt>
@@ -441,9 +445,9 @@ using the various options:</p></div>
</dt>
<dd>
<p>
- When these flags are specified, the object name recorded
+ When these flags are specified, the object names recorded
for the paths are not updated. Instead, these options
- sets and unsets the "assume unchanged" bit for the
+ set and unset the "assume unchanged" bit for the
paths. When the "assume unchanged" bit is on, git stops
checking the working tree files for possible
modifications, so you need to manually unset the bit to
@@ -511,7 +515,7 @@ you will need to handle the situation manually.</p></div>
<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 conflicts with the entry being added are
+ that conflict with the entry being added are
automatically removed with warning messages.
</p>
</dd>
@@ -794,7 +798,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 2008-12-10 08:33:29 UTC
+Last updated 2008-12-20 06:29:42 UTC
</div>
</div>
</body>