Merge branch 'mh/attr-macro-doc'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:04 +0000 (10:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:04 +0000 (10:44 -0800)
commitac355298b1bf8ba46aeb4aa7247b470d77ab5631
tree831eecfad4bb4f2ee34d5b7dbeecc04cae78ce6b
parent6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2
parente78e6967f3f3f28fd66c1dfe52544788e0cd0236
Merge branch 'mh/attr-macro-doc'

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