path: root/Documentation/gitattributes.txt
diff options
authorJunio C Hamano <>2009-04-08 06:05:14 (GMT)
committerJunio C Hamano <>2009-04-08 06:05:14 (GMT)
commit747f9d30ed706ebd930ef888971fff5638334831 (patch)
tree935ab8af02497137b524cc64059ae3f555249ae7 /Documentation/gitattributes.txt
parent714fddf2fc50cd5abb11d75837e6340edb9601f6 (diff)
parentaa41cf8f43687579363a2360795cac621d5254ed (diff)
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
Diffstat (limited to 'Documentation/gitattributes.txt')
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 55668e3..b762bba 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/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