Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit e78e696

Browse files
mhaggergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 69490f3 commit e78e696

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/gitattributes.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -930,9 +930,12 @@ state.
930930
DEFINING MACRO ATTRIBUTES
931931
-------------------------
932932

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:
936939

937940
------------
938941
[attr]binary -diff -merge -text

0 commit comments

Comments
 (0)