summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 20:27:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-22 20:27:22 (GMT)
commit3ab00292fc35540d5ee53b3b7e76ec4623d20b9b (patch)
tree10ff374068282ae9b054b0e82f5943dc46eda727 /Documentation
parent86362f7205a31188846de0aed94620c1f0776931 (diff)
parent27234a2ef3815050f7df5bf6ad356580f845a3ea (diff)
downloadgit-3ab00292fc35540d5ee53b3b7e76ec4623d20b9b.zip
git-3ab00292fc35540d5ee53b3b7e76ec4623d20b9b.tar.gz
git-3ab00292fc35540d5ee53b3b7e76ec4623d20b9b.tar.bz2
Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
* mg/doc-check-ignore-tracked-are-not-ignored: check-ignore: clarify treatment of tracked files
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-ignore.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index ee2e091..788a011 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -21,6 +21,9 @@ the exclude mechanism) that decides if the pathname is excluded or
included. Later patterns within a file take precedence over earlier
ones.
+By default, tracked files are not shown at all since they are not
+subject to exclude rules; but see `--no-index'.
+
OPTIONS
-------
-q, --quiet::