undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/attr-macro-doc'

Browse Source 
* mh/attr-macro-doc:
  gitattributes: document more clearly where macros are allowed
This commit is contained in:
Junio C Hamano 2014-01-27 10:44:04 -08:00
commit ac355298b1
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 DEFINING MACRO ATTRIBUTES
------------------------- -------------------------
Custom macro attributes can be defined only in the `.gitattributes` Custom macro attributes can be defined only in top-level gitattributes
file at the toplevel (i.e. not in any subdirectory). The built-in files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the
macro attribute "binary" is equivalent to: 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 [attr]binary -diff -merge -text