Anonymous committed 8d47dc7 Merge

Sync with maint

* maint:
attr: a note about the order of .gitattributes lookup

  • Participants
  • Parent commits d5e7c0c, 40701ad

Comments (0)

Files changed (1)

File Documentation/gitattributes.txt

 global and system-wide files are considered (they have the lowest
+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