summaryrefslogtreecommitdiff
path: root/Documentation/gitignore.txt
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-04-06 15:03:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 04:58:25 (GMT)
commit20ff3ec28e1dc7b653bfdc7643cb55045d7913fc (patch)
tree76fef7093b73d67afbe4adbd6da403e8c2512fbc /Documentation/gitignore.txt
parent39470cf961e584ddb505f51bb9c452ebcfd5c569 (diff)
downloadgit-20ff3ec28e1dc7b653bfdc7643cb55045d7913fc.zip
git-20ff3ec28e1dc7b653bfdc7643cb55045d7913fc.tar.gz
git-20ff3ec28e1dc7b653bfdc7643cb55045d7913fc.tar.bz2
Documentation: clarify .gitattributes search
Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill <jason@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitignore.txt')
-rw-r--r--Documentation/gitignore.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 59321a2..7df3cef 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -31,8 +31,8 @@ precedence, the last matching pattern decides the outcome):
* 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 root) being overridden by those in
- lower level files down to the directory containing the file.
+ 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