summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-30 09:07:17 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-30 09:07:17 +0000
commitbdeff822de152c9855766ea84cfd2534ebc19f52 (patch)
tree9a5ecf30791c00cd28cded8b040f968db93e3686 /gitattributes.html
parentb968dbbd6a939fc1282a7837026e131ed921e122 (diff)
downloadgit-htmldocs-bdeff822de152c9855766ea84cfd2534ebc19f52.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-91-g5c75
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitattributes.html b/gitattributes.html
index 6e0a9e14b..1a093eb3f 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -675,7 +675,7 @@ Then it examines <tt>.gitattributes</tt> (which is in the parent
</li>
<li>
<p>
-Finally it examines <tt>$GIT_DIR/info/gitattributes</tt>. This file
+Finally it examines <tt>$GIT_DIR/info/attributes</tt>. This file
is used to override the in-tree settings. The first line is
a match, and <tt>foo</tt> is set, <tt>bar</tt> is reverted to unspecified
state, and <tt>baz</tt> is unset.
@@ -698,7 +698,7 @@ frotz unspecified</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:10:00 UTC
+Last updated 30-Jul-2007 09:06:57 UTC
</div>
</div>
</body>