author | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Oct 2011 19:36:25 +0000 (12:36 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Oct 2011 19:36:25 +0000 (12:36 -0700) |
* sn/doc-update-index-assume-unchanged:
Documentation/git-update-index: refer to 'ls-files'
Documentation/git-update-index: refer to 'ls-files'
1 | 2 | |||
---|---|---|---|---|
Documentation/git-update-index.txt | patch | | diff1 | | diff2 | | blob | history |
diff --combined Documentation/git-update-index.txt
index d3931294d174e5c06adb81e428e31e00fbfa3b5e,d2ab35c999986f58c670d6327cd639e9ac4506be..a3081f4e237747dc858fd105302cbb9a489de41b
'git update-index'
[--add] [--remove | --force-remove] [--replace]
[--refresh] [-q] [--unmerged] [--ignore-missing]
- [--cacheinfo <mode> <object> <file>]\*
+ [(--cacheinfo <mode> <object> <file>)...]
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
[--skip-worktree | --no-skip-worktree]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
- [--] [<file>]\*
+ [--] [<file>...]
DESCRIPTION
-----------
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,
Report what is being added and removed from index.
-z::
- Only meaningful with `--stdin`; paths are separated with
- NUL character instead of LF.
+ Only meaningful with `--stdin` or `--index-info`; paths are
+ separated with NUL character instead of LF.
\--::
Do not interpret any more arguments as options.
"assume unchanged" bit, either before or after you modify them.
In order to set "assume unchanged" bit, use `--assume-unchanged`
- option. To unset, use `--no-assume-unchanged`.
+ option. To unset, use `--no-assume-unchanged`. To see which files
+ have the "assume unchanged" bit set, use `git ls-files -v`
+ (see linkgit:git-ls-files[1]).
The command looks at `core.ignorestat` configuration variable. When
this is true, paths updated with `git update-index paths...` and
SEE ALSO
--------
linkgit:git-config[1],
- linkgit:git-add[1]
+ linkgit:git-add[1],
+ linkgit:git-ls-files[1]
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite