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 <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Jan 14, 2014 at 03:58 UTC
e78e6967f3f3f28fd66c1dfe52544788e0cd0236
1 file changed
+6
-3
Documentation/gitattributes.txt
+6
-3
@@ -930,9 +930,12 @@ state.
930
DEFINING MACRO ATTRIBUTES
931
-------------------------
932
933
-Custom macro attributes can be defined only in the `.gitattributes`
934
-file at the toplevel (i.e. not in any subdirectory). The built-in
935
-macro attribute "binary" is equivalent to:
933
+Custom macro attributes can be defined only in top-level gitattributes
934
+files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
935
+top level of the working tree, or the global or system-wide
936
+gitattributes files), not in `.gitattributes` files in working tree
937
+subdirectories. The built-in macro attribute "binary" is equivalent
938
+to:
939
940
------------
941
[attr]binary -diff -merge -text