diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
| commit | c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1 (patch) | |
| tree | 1e2fc163814f8a67de8629f2a39db92f2160c39b /gitattributes.html | |
| parent | fd98be8ac969289726bc1df7bab75d2e02ddbaa7 (diff) | |
| download | git-htmldocs-c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1.tar.gz | |
Autogenerated HTML docs for v1.9-rc1
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html index c30a70d69..2b86d34b9 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -1771,9 +1771,12 @@ state.</p></div> <div class="sect1">
<h2 id="_defining_macro_attributes">DEFINING MACRO ATTRIBUTES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Custom macro attributes can be defined only in the <tt>.gitattributes</tt>
-file at the toplevel (i.e. not in any subdirectory). The built-in
-macro attribute "binary" is equivalent to:</p></div>
+<div class="paragraph"><p>Custom macro attributes can be defined only in top-level gitattributes
+files (<tt>$GIT_DIR/info/attributes</tt>, the <tt>.gitattributes</tt> file at the
+top level of the working tree, or the global or system-wide
+gitattributes files), not in <tt>.gitattributes</tt> files in working tree
+subdirectories. The built-in macro attribute "binary" is equivalent
+to:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[attr]binary -diff -merge -text</tt></pre>
@@ -1854,7 +1857,7 @@ frotz unspecified</tt></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2014-01-27 13:30:07 PST
</div>
</div>
</body>
|