development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitattributes: document more clearly where macros are allowed

Browse source 
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>
This commit is contained in:
Michael Haggerty 2014-01-14 03:58:49 +01:00 committed by Junio C Hamano
parent 69490f3459
commit e78e6967f3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Documentation/gitattributes.txt
View file

@ -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