Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:54:25 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:54:33 +0000 (14:54 -0700)
commit8d47dc7f2ddaa70b388fb3f739b9339de826a7fb
tree7de3c16ca8a770f90ecb63b3fe75b39a75bef097
parentd5e7c0c21c905bfb71fba13dc9dbed431c53a37b
parent40701adbcbbc1e3e4485562a36343f4781e62be5
Sync with maint

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