Sync with maint
authorJunio C Hamano <redacted>
Wed, 10 Oct 2012 21:54:25 +0000 (14:54 -0700)
committerJunio C Hamano <redacted>
Wed, 10 Oct 2012 21:54:33 +0000 (14:54 -0700)
* maint:
  attr: a note about the order of .gitattributes lookup

1  2 
Documentation/gitattributes.txt

Simple merge
git clone https://git.99rst.org/PROJECT