summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:19 (GMT)
commita574c04fbfa06d9b40c4c32db27135c503da7c15 (patch)
tree13b9ee7c195f9aa80433e504d8fb8d569e26c5d9 /Documentation
parent632052641517de1a965c1f045b97d2eaa541b2e9 (diff)
parent69d61daec7a7915f6a664f32002fd9403e7f2a34 (diff)
downloadgit-a574c04fbfa06d9b40c4c32db27135c503da7c15.zip
git-a574c04fbfa06d9b40c4c32db27135c503da7c15.tar.gz
git-a574c04fbfa06d9b40c4c32db27135c503da7c15.tar.bz2
Merge branch 'maint-1.7.5' into maint-1.7.6
* maint-1.7.5: 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 d393129..a3081f4 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]
GIT
---