path: root/Documentation/gitattributes.txt
diff options
authorJunio C Hamano <>2009-04-08 05:51:14 (GMT)
committerJunio C Hamano <>2009-04-08 05:51:14 (GMT)
commitaa41cf8f43687579363a2360795cac621d5254ed (patch)
treecf46e92578852a6a36eaf359a517831fcf6379bb /Documentation/gitattributes.txt
parentacb0b7b01f64cf55d508b469eb2a351359c0cd82 (diff)
parent20ff3ec28e1dc7b653bfdc7643cb55045d7913fc (diff)
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: 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 8af22ec..82c10fa 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