diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 14:48:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 14:48:09 -0800 |
| commit | 6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9 (patch) | |
| tree | 61e19c43f6d3ff81843003c365713c7213fb26f1 /git-update-index.html | |
| parent | 30758bdbd92da4a8a57a943699d50e65f12646a0 (diff) | |
| download | git-htmldocs-6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9.tar.gz | |
Autogenerated HTML docs for v2.2.1-201-gbbceff
Diffstat (limited to 'git-update-index.html')
| -rw-r--r-- | git-update-index.html | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/git-update-index.html b/git-update-index.html index 9ad29748d..2e60bec36 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -882,21 +882,19 @@ using the various options:</p></div> </dt>
<dd>
<p>
- When these flags are specified, the object names recorded
- for the paths are not updated. Instead, these options
- 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
- tell Git when you change the working tree file. This is
+ When this flag is specified, the object names recorded
+ for the paths are not updated. Instead, this option
+ sets/unsets the "assume unchanged" bit for the
+ paths. When the "assume unchanged" bit is on, the user
+ promises not to change the file and allows Git to assume
+ that the working tree file matches what is recorded in
+ the index. If you want to change the working tree file,
+ you need to unset the bit to tell Git. This is
sometimes helpful when working with a big project on a
filesystem that has very slow lstat(2) system call
(e.g. cifs).
</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
-<code>.gitignore</code> does for untracked files).
-Git will fail (gracefully) in case it needs to modify this file
+<div class="paragraph"><p>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,
you will need to handle the situation manually.</p></div>
@@ -1320,7 +1318,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-11-04 14:37:41 PST
+Last updated 2014-12-22 14:47:31 PST
</div>
</div>
</body>
|