diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-01-14 03:58:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-14 13:56:56 -0800 |
| commit | e78e6967f3f3f28fd66c1dfe52544788e0cd0236 (patch) | |
| tree | f0c1415857e65945b926f3bcb0817c9886c56ce1 /Documentation/gitattributes.txt | |
| parent | 69490f345943f6f6d7ae52e0e9c870e8b48a5dea (diff) | |
| download | git-e78e6967f3f3f28fd66c1dfe52544788e0cd0236.tar.gz git-e78e6967f3f3f28fd66c1dfe52544788e0cd0236.tar.xz | |
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>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b322a2666..643c1ba92 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 |