diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-06-13 19:57:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-06-13 19:57:10 +0000 |
| commit | a574a0905e5c1cf6915624561a011e486cccc25d (patch) | |
| tree | f8e1c02eb76cc8831442ead327d686de001c8b60 /git-update-index.html | |
| parent | 13002fbb3347e98e74c1ff7ec581fda52a09dd72 (diff) | |
| download | git-htmldocs-a574a0905e5c1cf6915624561a011e486cccc25d.tar.gz | |
Autogenerated HTML docs for v1.7.1-331-ga5080
Diffstat (limited to 'git-update-index.html')
| -rw-r--r-- | git-update-index.html | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/git-update-index.html b/git-update-index.html index 6d7f30fbe..56c47781a 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -460,8 +460,6 @@ using the various options:</p></div> <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,
@@ -839,7 +837,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-04-24 02:56:11 UTC
+Last updated 2010-06-13 19:56:37 UTC
</div>
</div>
</body>
|