summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-17 01:57:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-17 01:57:06 (GMT)
commit987e315a6b5a5dd224602f09b9dc7c0fe9c7d024 (patch)
treece10af22609413c4316e12335387bcfa0ef1bf9b /Documentation
parent1ae419cb3902e6cc45538a9673539ed5316fcf30 (diff)
parent6831a88ac03759a8133f10ffd52ad235a081a8a3 (diff)
downloadgit-987e315a6b5a5dd224602f09b9dc7c0fe9c7d024.zip
git-987e315a6b5a5dd224602f09b9dc7c0fe9c7d024.tar.gz
git-987e315a6b5a5dd224602f09b9dc7c0fe9c7d024.tar.bz2
Merge branch 'jc/gitignore-ends-with-slash'
* jc/gitignore-ends-with-slash: gitignore: lazily find dtype gitignore(5): Allow "foo/" in ignore list to match directory "foo"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitignore.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 08373f5..e847b3b 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -57,6 +57,13 @@ Patterns have the following format:
included again. If a negated pattern matches, this will
override lower precedence patterns sources.
+ - If the pattern ends with a slash, it is removed for the
+ purpose of the following description, but it would only find
+ a match with a directory. In other words, `foo/` will match a
+ directory `foo` and paths underneath it, but will not match a
+ regular file or a symbolic link `foo` (this is consistent
+ with the way how pathspec works in general in git).
+
- If the pattern does not contain a slash '/', git treats it as
a shell glob pattern and checks for a match against the
pathname without leading directories.