summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:04 (GMT)
commitac355298b1bf8ba46aeb4aa7247b470d77ab5631 (patch)
tree831eecfad4bb4f2ee34d5b7dbeecc04cae78ce6b /Documentation
parent6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2 (diff)
parente78e6967f3f3f28fd66c1dfe52544788e0cd0236 (diff)
downloadgit-ac355298b1bf8ba46aeb4aa7247b470d77ab5631.zip
git-ac355298b1bf8ba46aeb4aa7247b470d77ab5631.tar.gz
git-ac355298b1bf8ba46aeb4aa7247b470d77ab5631.tar.bz2
Merge branch 'mh/attr-macro-doc'
* mh/attr-macro-doc: gitattributes: document more clearly where macros are allowed
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index b322a26..643c1ba 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