From: Michael Haggerty Date: Tue, 14 Jan 2014 02:58:49 +0000 (+0100) Subject: gitattributes: document more clearly where macros are allowed X-Git-Tag: v1.9-rc1~22^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e78e6967f3f3f28fd66c1dfe52544788e0cd0236?ds=inline;hp=--cc gitattributes: document more clearly where macros are allowed The old text made it sound like macros are only allowed in the .gitattributes file at the top-level of the working tree. Make it clear that they are also allowed in $GIT_DIR/info/attributes and in the global and system-wide gitattributes files. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- e78e6967f3f3f28fd66c1dfe52544788e0cd0236 diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b322a2666c..643c1ba929 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -930,9 +930,12 @@ state. DEFINING MACRO ATTRIBUTES ------------------------- -Custom macro attributes can be defined only in the `.gitattributes` -file at the toplevel (i.e. not in any subdirectory). The built-in -macro attribute "binary" is equivalent to: +Custom macro attributes can be defined only in top-level gitattributes +files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the +top level of the working tree, or the global or system-wide +gitattributes files), not in `.gitattributes` files in working tree +subdirectories. The built-in macro attribute "binary" is equivalent +to: ------------ [attr]binary -diff -merge -text