summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-17 22:02:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-17 22:02:23 (GMT)
commit16a4bf10359edf34a7c62d6466dab2e33060d332 (patch)
tree109910396fb1d1f2339976bb23532f8306446f03 /Documentation
parent3246495a5cb9a4e81be16053555b9ee984522a79 (diff)
parent7ec8125fba96f47b00bb0cab3ed716557e81e7e6 (diff)
downloadgit-16a4bf10359edf34a7c62d6466dab2e33060d332.zip
git-16a4bf10359edf34a7c62d6466dab2e33060d332.tar.gz
git-16a4bf10359edf34a7c62d6466dab2e33060d332.tar.bz2
Merge branch 'en/check-ignore' into maint
"git check-ignore" did not work when the given path is explicitly marked as not ignored with a negative entry in the .gitignore file. * en/check-ignore: check-ignore: fix documentation and implementation to match
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-ignore.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index 8b2d49c..0c3924a 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -30,9 +30,15 @@ OPTIONS
valid with a single pathname.
-v, --verbose::
- Also output details about the matching pattern (if any)
- for each given pathname. For precedence rules within and
- between exclude sources, see linkgit:gitignore[5].
+ Instead of printing the paths that are excluded, for each path
+ that matches an exclude pattern, print the exclude pattern
+ together with the path. (Matching an exclude pattern usually
+ means the path is excluded, but if the pattern begins with '!'
+ then it is a negated pattern and matching it means the path is
+ NOT excluded.)
++
+For precedence rules within and between exclude sources, see
+linkgit:gitignore[5].
--stdin::
Read pathnames from the standard input, one per line,