summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:08:00 (GMT)
commiteb4e67288bb9d66fb46092fa30d72c4bdded0c2a (patch)
treeca6ac1501f7dd8de09fabe58072b5629445ff68c
parentc14daa4845ff2ec0d27807fa50f9fac1ca4d6462 (diff)
parentacd6d7e70a0dd2a91c6028e5ca68d19c5de4d00b (diff)
downloadgit-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.zip
git-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.tar.gz
git-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.tar.bz2
Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3
* sn/doc-update-index-assume-unchanged: Documentation/git-update-index: refer to 'ls-files'
-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