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

diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index ee2e0917040909bd62df073e20f1120c23a43a63..788a0115805214f4169c50279d94cd31e5f0becc 100644 (file)
--- 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::