summaryrefslogtreecommitdiff
path: root/Documentation
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
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')
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/gitignore.txt4
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 37fff20..c4aebc4 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -59,9 +59,9 @@ attribute.
When deciding what attributes are assigned to a path, git
consults `$GIT_DIR/info/attributes` file (which has the highest
precedence), `.gitattributes` file in the same directory as the
-path in question, and its parent directories (the further the
-directory that contains `.gitattributes` is from the path in
-question, the lower its precedence).
+path in question, and its parent directories up to the toplevel of the
+work tree (the further the directory that contains `.gitattributes`
+is from the path in question, the lower its precedence).
If you wish to affect only a single repository (i.e., to assign
attributes to files that are particular to one user's workflow), then
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