From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:44:04 +0000 (-0800)
Subject: Merge branch 'mh/attr-macro-doc'
X-Git-Tag: v1.9-rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac355298b1bf8ba46aeb4aa7247b470d77ab5631;p=thirdparty%2Fgit.git

Merge branch 'mh/attr-macro-doc'

* mh/attr-macro-doc:
  gitattributes: document more clearly where macros are allowed
---

ac355298b1bf8ba46aeb4aa7247b470d77ab5631