{"thread":{"id":"35651","subject":"[PATCH] gitattributes: document more clearly where macros are allowed","startedAt":"2014-01-14T02:58:49Z","lastAt":"2014-01-14T02:58:49Z","messageCount":1,"participants":["Michael Haggerty"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"233079","messageId":"1389668329-15719-1-git-send-email-mhagger@alum.mit.edu","threadId":"35651","inReplyTo":null,"subject":"[PATCH] gitattributes: document more clearly where macros are allowed","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2014-01-14T02:58:49Z","receivedAt":"2014-01-14T02:58:49Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"The old text made it sound like macros are only allowed in the\n.gitattributes file at the top-level of the working tree.  Make it\nclear that they are also allowed in $GIT_DIR/info/attributes and in\nthe global and system-wide gitattributes files.\n\nSigned-off-by: Michael Haggerty <mhagger@alum.mit.edu>\n---\n Documentation/gitattributes.txt | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex b322a26..643c1ba 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -930,9 +930,12 @@ state.\n DEFINING MACRO ATTRIBUTES\n -------------------------\n \n-Custom macro attributes can be defined only in the `.gitattributes`\n-file at the toplevel (i.e. not in any subdirectory).  The built-in\n-macro attribute \"binary\" is equivalent to:\n+Custom macro attributes can be defined only in top-level gitattributes\n+files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the\n+top level of the working tree, or the global or system-wide\n+gitattributes files), not in `.gitattributes` files in working tree\n+subdirectories.  The built-in macro attribute \"binary\" is equivalent\n+to:\n \n ------------\n [attr]binary -diff -merge -text\n-- \n1.8.5.2\n"}]}