summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-04-08 07:36:32 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-04-08 07:36:32 +0000
commitb4a9ede67c31b37be6bc1ac69406ccafe843ffaf (patch)
treefa4d020290acf32e59b7e577ccdad0c3aa91ebd9 /gitattributes.html
parent5f9a6f09653d6397ddb553c1824279557ba878a7 (diff)
downloadgit-htmldocs-b4a9ede67c31b37be6bc1ac69406ccafe843ffaf.tar.gz
Autogenerated HTML docs for v1.6.2.2-471-g6da14
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html
index b3d71311d..57047c75a 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -386,9 +386,9 @@ same as in <tt>.gitignore</tt> files; see <a href="gitignore.html">gitignore(5)<
<div class="para"><p>When deciding what attributes are assigned to a path, git
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 (the further the
-directory that contains <tt>.gitattributes</tt> is from the path in
-question, the lower its precedence).</p></div>
+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>
<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 should be placed in the <tt>$GIT_DIR/info/attributes</tt> file.
@@ -1020,7 +1020,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-04-02 06:50:08 UTC
+Last updated 2009-04-08 07:36:13 UTC
</div>
</div>
</body>