![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Aug 2011 21:16:17 +0000 (14:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Aug 2011 21:16:17 +0000 (14:16 -0700) | ||
| commit | 6a319e393b856461bab89ffe332a02e71befee40 | |
| tree | 730908c3beb0e261b4082db8b83cf11aa8c11b01 | tree | snapshot |
| parent | 1b57e56c6191c87b7b372fce3be05f930423780b | commit | diff |
| parent | e9e0643fe64b613b6596b79b59df8ff10746f1a1 | commit | diff |
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
* 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