diff options
author | Nguyen Thai Ngoc Duy <pclouds@gmail.com> | 2012-10-10 20:55:52 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-10-10 11:09:20 -0700 |
commit | 40701adbcbbc1e3e4485562a36343f4781e62be5 (patch) | |
tree | 09e5c4b3af7b9595861cb54a46d1aa2183ff9746 | |
parent | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff) | |
download | tgif-40701adbcbbc1e3e4485562a36343f4781e62be5.tar.xz |
attr: a note about the order of .gitattributes lookup
This is the documentation part of
1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14)
06f33c1 (Read attributes from the index that is being checked out - 2009-03-13)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/gitattributes.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e16f3e175b..aff760ef7b 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -66,6 +66,11 @@ is from the path in question, the lower its precedence). Finally global and system-wide files are considered (they have the lowest precedence). +When the `.gitattributes` file is missing from the work tree, the +path in the index is used as a fall-back. During checkout process, +`.gitattributes` in the index is used and then the file in the +working tree is used as a fall-back. + If you wish to affect only a single repository (i.e., to assign attributes to files that are particular to one user's workflow for that repository), then |