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.txt | |
parent | 30758bdbd92da4a8a57a943699d50e65f12646a0 (diff) | |
download | git-htmldocs-6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9.tar.gz |
Autogenerated HTML docs for v2.2.1-201-gbbceff
Diffstat (limited to 'git-update-index.txt')
-rw-r--r-- | git-update-index.txt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index 929869b0a..aff01798c 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -82,20 +82,18 @@ OPTIONS Set the execute permissions on the updated files. --[no-]assume-unchanged:: - 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). + -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). 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, |