summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorLibravatar Jason Merrill <jason@redhat.com>2009-04-06 11:03:36 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-07 21:58:25 -0700
commit20ff3ec28e1dc7b653bfdc7643cb55045d7913fc (patch)
tree76fef7093b73d67afbe4adbd6da403e8c2512fbc /Documentation/gitattributes.txt
parentgit-checkout.txt: clarify that <branch> applies when no path is given. (diff)
downloadtgif-20ff3ec28e1dc7b653bfdc7643cb55045d7913fc.tar.xz
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/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 37fff208ff..c4aebc4351 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