From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Aug 2011 21:16:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.7-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a319e393b856461bab89ffe332a02e71befee40;p=git.git

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
---

6a319e393b856461bab89ffe332a02e71befee40