summaryrefslogtreecommitdiffstats
path: root/gitattributes.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 14:53:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-11 14:53:45 -0700
commit8e61f1f0ae2b26f579e02f6a31988a2beeca509d (patch)
tree04c3ba3eb6f4dd35eef9f63d0159da95b525f380 /gitattributes.html
parent53fe031ef8167aa5a2d2d804524f4442cdc52658 (diff)
downloadgit-htmldocs-8e61f1f0ae2b26f579e02f6a31988a2beeca509d.tar.gz
Autogenerated HTML docs for v2.1.0-238-gce1d3
Diffstat (limited to 'gitattributes.html')
-rw-r--r--gitattributes.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitattributes.html b/gitattributes.html
index 2b86d34b9..997c6fb6f 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1209,8 +1209,8 @@ Unspecified
<p>
A path to which the <tt>diff</tt> attribute is unspecified
first gets its contents inspected, and if it looks like
- text, it is treated as text. Otherwise it would
- generate <tt>Binary files differ</tt>.
+ text and is smaller than core.bigFileThreshold, it is treated
+ as text. Otherwise it would generate <tt>Binary files differ</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -1857,7 +1857,7 @@ frotz unspecified</tt></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-01-27 13:30:07 PST
+Last updated 2014-09-11 14:53:10 PDT
</div>
</div>
</body>