summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:08 (GMT)
commited36a48e6d246f4f60d44b27e8c1e660151cd0b4 (patch)
treee0b4b25edee7aec9592650055c3659a659d1d9ac /Documentation
parentcdb791f61d71db24fa54363ff6d4b42a46ebbdf1 (diff)
parenteb4e67288bb9d66fb46092fa30d72c4bdded0c2a (diff)
downloadgit-ed36a48e6d246f4f60d44b27e8c1e660151cd0b4.zip
git-ed36a48e6d246f4f60d44b27e8c1e660151cd0b4.tar.gz
git-ed36a48e6d246f4f60d44b27e8c1e660151cd0b4.tar.bz2
Merge branch 'maint-1.7.3' into maint-1.7.4
* maint-1.7.3: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-update-index.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1ca56c8..c30f8cd 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -264,7 +264,9 @@ tree files, you have to explicitly tell git about it by dropping
"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
@@ -363,7 +365,8 @@ ctime for marking files processed) (see linkgit:git-config[1]).
SEE ALSO
--------
linkgit:git-config[1],
-linkgit:git-add[1]
+linkgit:git-add[1],
+linkgit:git-ls-files[1]
Author