diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:14 -0700 |
| commit | 747f9d30ed706ebd930ef888971fff5638334831 (patch) | |
| tree | 935ab8af02497137b524cc64059ae3f555249ae7 /Documentation/gitattributes.txt | |
| parent | 714fddf2fc50cd5abb11d75837e6340edb9601f6 (diff) | |
| parent | aa41cf8f43687579363a2360795cac621d5254ed (diff) | |
| download | git-747f9d30ed706ebd930ef888971fff5638334831.tar.gz | |
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')
| -rw-r--r-- | Documentation/gitattributes.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 55668e345f..b762bba759 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 |