Skip to content

Commit 20ff3ec

Browse files
jicamagitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 39470cf commit 20ff3ec

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Documentation/gitattributes.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ attribute.
5959
When deciding what attributes are assigned to a path, git
6060
consults `$GIT_DIR/info/attributes` file (which has the highest
6161
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).
6565

6666
If you wish to affect only a single repository (i.e., to assign
6767
attributes to files that are particular to one user's workflow), then

Documentation/gitignore.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ precedence, the last matching pattern decides the outcome):
3131

3232
* Patterns read from a `.gitignore` file in the same directory
3333
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.
3636
These patterns match relative to the location of the
3737
`.gitignore` file. A project normally includes such
3838
`.gitignore` files in its repository, containing patterns for

0 commit comments

Comments
 (0)