Autogenerated HTML docs for v2.17.0-rc1

1 files changed, 18 insertions, 4 deletions

diff --git a/gitattributes.html b/gitattributes.html
index f869933de..6657179f1 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -812,9 +812,23 @@ Unspecified
 </dl></div>

 <div class="paragraph"><p>When more than one pattern matches the path, a later line

 overrides an earlier line.  This overriding is done per

-attribute.  The rules how the pattern matches paths are the

-same as in <code>.gitignore</code> files; see <a href="gitignore.html">gitignore(5)</a>.

-Unlike <code>.gitignore</code>, negative patterns are forbidden.</p></div>

+attribute.</p></div>

+<div class="paragraph"><p>The rules by which the pattern matches paths are the same as in

+<code>.gitignore</code> files (see <a href="gitignore.html">gitignore(5)</a>), with a few exceptions:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+negative patterns are forbidden

+</p>

+</li>

+<li>

+<p>

+patterns that match a directory do not recursively match paths

+    inside that directory (so using the trailing-slash <code>path/</code> syntax is

+    pointless in an attributes file; use <code>path/**</code> instead)

+</p>

+</li>

+</ul></div>

 <div class="paragraph"><p>When deciding what attributes are assigned to a path, Git

 consults <code>$GIT_DIR/info/attributes</code> file (which has the highest

 precedence), <code>.gitattributes</code> file in the same directory as the

@@ -2047,7 +2061,7 @@ frotz   unspecified</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-03-08 13:35:19 PST

+ 2018-03-21 12:51:04 PDT

 </div>

 </div>

 </body>