summaryrefslogtreecommitdiffstats
path: root/gitignore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-28 14:02:52 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-28 14:02:52 -0700
commit20cf493fa70faeee54b449ba267598e3b3982edb (patch)
tree9639e3f02bbf40815f887b3a346fd3d9a10e9886 /gitignore.txt
parent3c27de63e121444e76e7178a4f5bdc73cfccb416 (diff)
downloadgit-htmldocs-20cf493fa70faeee54b449ba267598e3b3982edb.tar.gz
Autogenerated HTML docs for v2.32.0-452-g940fe
Diffstat (limited to 'gitignore.txt')
-rw-r--r--gitignore.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/gitignore.txt b/gitignore.txt
index 53e7d5c91..f8a1fc201 100644
--- a/gitignore.txt
+++ b/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`.