summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 12:37:32 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-20 12:37:32 -0700
commit005a1de380733477382c50e2e44ed8042c401fed (patch)
tree16d8b71bca9dd50d0c46b14948920b374f88c634 /Documentation
parentb4980c63acad8457fb3606b9bd8b74d5e7cba8dd (diff)
parent8231fa6ae1ef92be73bec5cf0a533a4d8b71d536 (diff)
downloadgit-005a1de380733477382c50e2e44ed8042c401fed.tar.gz
Merge branch 'dw/check-ignore-sans-index'
"git check-ignore" follows the same rule as "git add" and "git status" in that the ignore/exclude mechanism does not take effect on paths that are already tracked. With "--no-index" option, it can be used to diagnose which paths that should have been ignored have been mistakenly added to the index. * dw/check-ignore-sans-index: check-ignore: Add option to ignore index contents
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-ignore.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index d2df487aa2..ee2e091704 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -45,6 +45,13 @@ OPTIONS
not be possible to distinguish between paths which match a
pattern and those which don't.
+--no-index::
+ Don't look in the index when undertaking the checks. This can
+ be used to debug why a path became tracked by e.g. `git add .`
+ and was not ignored by the rules as expected by the user or when
+ developing patterns including negation to match a path previously
+ added with `git add -f`.
+
OUTPUT
------