Merge branch 'maint'

* maint: add gitignore entry to description about how to write a builtin gitattributes: Reword "attribute macro" to "macro attribute" gitattributes: Clarify discussion of attribute macros

Junio C Hamano committed Aug 3, 2011 at 14:16 UTC 6a319e393b856461bab89ffe332a02e71befee40

No changes.