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>
Jason Merrill committed
Apr 6, 2009 at 11:03 UTC
20ff3ec28e1dc7b653bfdc7643cb55045d7913fc
2 files changed
+5
-5
Documentation/gitattributes.txt
+3
-3
@@ -59,9 +59,9 @@ attribute.
59
When deciding what attributes are assigned to a path, git
60
consults `$GIT_DIR/info/attributes` file (which has the highest
61
precedence), `.gitattributes` file in the same directory as the
62
-path in question, and its parent directories (the further the
63
-directory that contains `.gitattributes` is from the path in
64
-question, the lower its precedence).
62
+path in question, and its parent directories up to the toplevel of the
63
+work tree (the further the directory that contains `.gitattributes`
64
+is from the path in question, the lower its precedence).
65
66
If you wish to affect only a single repository (i.e., to assign
67
attributes to files that are particular to one user's workflow), then
Documentation/gitignore.txt
+2
-2
@@ -31,8 +31,8 @@ precedence, the last matching pattern decides the outcome):
31
32
* Patterns read from a `.gitignore` file in the same directory
33
as the path, or in any parent directory, with patterns in the
34
- higher level files (up to the root) being overridden by those in
35
- lower level files down to the directory containing the file.
34
+ higher level files (up to the toplevel of the work tree) being overridden
35
+ by those in lower level files down to the directory containing the file.
36
These patterns match relative to the location of the
37
`.gitignore` file. A project normally includes such
38
`.gitignore` files in its repository, containing patterns for