Sync with maint

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

diff --combined Documentation/gitattributes.txt
index 99ed04d7abf7e0ee94feec6802e2dbf0da87f9d7,aff760ef7beefe81563f703c608dead93ce0704f..ba02d4de5901b4448411654ecdf76a1b1980e53b
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -66,6 -66,11 +66,11 @@@ is from the path in question, the lowe
  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
@@@ -511,8 -516,6 +516,8 @@@ configuration file (you still need to e
  attribute mechanism, via `.gitattributes`).  The following built in
  patterns are available:
  
 +- `ada` suitable for source code in the Ada language.
 +
  - `bibtex` suitable for files with BibTeX coded references.
  
  - `cpp` suitable for source code in the C and C++ languages.
@@@ -929,7 -932,7 +934,7 @@@ file at the toplevel (i.e. not in any s
  macro attribute "binary" is equivalent to:
  
  ------------
 -[attr]binary -diff -text
 +[attr]binary -diff -merge -text
  ------------