Autogenerated HTML docs for v1.7.3.1-45-g9855

1 files changed, 16 insertions, 4 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 0ed0c2b8b..fdaeea3c4 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -388,13 +388,20 @@ consults <tt>$GIT_DIR/info/attributes</tt> file (which has the highest
 precedence), <tt>.gitattributes</tt> file in the same directory as the

 path in question, and its parent directories up to the toplevel of the

 work tree (the further the directory that contains <tt>.gitattributes</tt>

-is from the path in question, the lower its precedence).</p></div>

+is from the path in question, the lower its precedence). Finally

+global and system-wide files are considered (they have the lowest

+precedence).</p></div>

 <div class="para"><p>If you wish to affect only a single repository (i.e., to assign

-attributes to files that are particular to one user's workflow), then

+attributes to files that are particular to

+one user's workflow for that repository), then

 attributes should be placed in the <tt>$GIT_DIR/info/attributes</tt> file.

 Attributes which should be version-controlled and distributed to other

 repositories (i.e., attributes of interest to all users) should go into

-<tt>.gitattributes</tt> files.</p></div>

+<tt>.gitattributes</tt> files. Attributes that should affect all repositories

+for a single user should be placed in a file specified by the

+<tt>core.attributesfile</tt> configuration option (see <a href="git-config.html">git-config(1)</a>).

+Attributes for all users on a system should be placed in the

+<tt>$(prefix)/etc/gitattributes</tt> file.</p></div>

 <div class="para"><p>Sometimes you would need to override an setting of an attribute

 for a path to <tt>unspecified</tt> state.  This can be done by listing

 the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p></div>

@@ -803,6 +810,11 @@ patterns are available:</p></div>
 </li>

 <li>

 <p>

+<tt>fortran</tt> suitable for source code in the Fortran language.

+</p>

+</li>

+<li>

+<p>

 <tt>html</tt> suitable for HTML/XHTML documents.

 </p>

 </li>

@@ -1213,7 +1225,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-09-18 23:57:03 UTC

+Last updated 2010-09-30 00:03:00 UTC

 </div>

 </div>

 </body>