summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-10 21:54:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-10 21:54:33 (GMT)
commit8d47dc7f2ddaa70b388fb3f739b9339de826a7fb (patch)
tree7de3c16ca8a770f90ecb63b3fe75b39a75bef097
parentd5e7c0c21c905bfb71fba13dc9dbed431c53a37b (diff)
parent40701adbcbbc1e3e4485562a36343f4781e62be5 (diff)
downloadgit-8d47dc7f2ddaa70b388fb3f739b9339de826a7fb.zip
git-8d47dc7f2ddaa70b388fb3f739b9339de826a7fb.tar.gz
git-8d47dc7f2ddaa70b388fb3f739b9339de826a7fb.tar.bz2
Sync with maint
* maint: attr: a note about the order of .gitattributes lookup
-rw-r--r--Documentation/gitattributes.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 99ed04d..ba02d4d 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