summaryrefslogtreecommitdiffstats
path: root/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-04-08 07:36:32 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-04-08 07:36:32 +0000
commitb4a9ede67c31b37be6bc1ac69406ccafe843ffaf (patch)
treefa4d020290acf32e59b7e577ccdad0c3aa91ebd9 /gitattributes.txt
parent5f9a6f09653d6397ddb553c1824279557ba878a7 (diff)
downloadgit-htmldocs-b4a9ede67c31b37be6bc1ac69406ccafe843ffaf.tar.gz
Autogenerated HTML docs for v1.6.2.2-471-g6da14
Diffstat (limited to 'gitattributes.txt')
-rw-r--r--gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitattributes.txt b/gitattributes.txt
index 55668e345..b762bba75 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -60,9 +60,9 @@ same as in `.gitignore` files; see linkgit:gitignore[5].
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