summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-22 13:05:55 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-22 13:05:55 -0700
commitbb3a55f6d32c86a25104097254b6fb8c5c3b7977 (patch)
tree4f842ae730a141bce38c7eee789e82a593260093 /Documentation
parentdae59cb26302fe384158a04b5fe4b204d95dfef0 (diff)
parente04170697a2848189492d53c7b3aab59c32d044f (diff)
downloadgit-bb3a55f6d32c86a25104097254b6fb8c5c3b7977.tar.gz
Merge branch 'ab/gitignore-discovery-doc'
Doc update. * ab/gitignore-discovery-doc: docs: .gitignore parsing is to the top of the repo
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitignore.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 53e7d5c914..f8a1fc2014 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -27,12 +27,11 @@ precedence, the last matching pattern decides the outcome):
them.
* Patterns read from a `.gitignore` file in the same directory
- as the path, or in any parent directory, with patterns in the
- higher level files (up to the toplevel of the work tree) being overridden
- by those in lower level files down to the directory containing the file.
- These patterns match relative to the location of the
- `.gitignore` file. A project normally includes such
- `.gitignore` files in its repository, containing patterns for
+ as the path, or in any parent directory (up to the top-level of the working
+ tree), with patterns in the higher level files being overridden by those in
+ lower level files down to the directory containing the file. These patterns
+ match relative to the location of the `.gitignore` file. A project normally
+ includes such `.gitignore` files in its repository, containing patterns for
files generated as part of the project build.
* Patterns read from `$GIT_DIR/info/exclude`.