diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-20 01:24:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-20 01:24:17 +0000 |
| commit | 915cd9bb00e770c8b6862d4d79a192d45605e1ca (patch) | |
| tree | 45b5dcc0042c5b9f8efd47af9fabaeb5c57282dc /git-update-index.html | |
| parent | f69a0a065df32be5accdda5105d54c580c21e0ee (diff) | |
| download | git-htmldocs-915cd9bb00e770c8b6862d4d79a192d45605e1ca.tar.gz | |
Autogenerated HTML docs for v1.5.6.4-433-g09651
Diffstat (limited to 'git-update-index.html')
| -rw-r--r-- | git-update-index.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-update-index.html b/git-update-index.html index be8215530..90099e2cd 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -452,6 +452,15 @@ using the various options:</p></div> filesystem that has very slow lstat(2) system call
(e.g. cifs).
</p>
+<div class="para"><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).
+You should remember that an explicit <em>git add</em> operation will
+still cause the file to be refreshed from the working tree.
+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>
</dd>
<dt>
-g
@@ -781,7 +790,7 @@ from symbolic link to regular file.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:17:06 UTC
+Last updated 2008-07-20 01:23:35 UTC
</div>
</div>
</body>
|