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.txt | |
| parent | 13002fbb3347e98e74c1ff7ec581fda52a09dd72 (diff) | |
| download | git-htmldocs-a574a0905e5c1cf6915624561a011e486cccc25d.tar.gz | |
Autogenerated HTML docs for v1.7.1-331-ga5080
Diffstat (limited to 'git-update-index.txt')
| -rw-r--r-- | git-update-index.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index 68dc1879f..765d4b312 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -93,8 +93,6 @@ OPTIONS This option can be also used as a coarse file-level mechanism to ignore uncommitted changes in tracked files (akin to what `.gitignore` does for untracked files). -You should remember that an explicit 'git add' 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, |