mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-20 06:10:17 +02:00
Code

Sync with maint 

* maint:
  attr: a note about the order of .gitattributes lookup
This commit is contained in:
Junio C Hamano 2012-10-10 14:54:25 -07:00
parent d5e7c0c21c 40701adbcb
commit 8d47dc7f2d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/gitattributes.txt
View File

@ -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