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.txt | |
| 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.txt')
| -rw-r--r-- | git-update-index.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index a91fd214d..6b930bc16 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -88,6 +88,16 @@ OPTIONS sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e.g. cifs). ++ +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, +you will need to handle the situation manually. -g:: --again:: |