diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-04 14:38:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-04 14:38:56 -0800 |
commit | fb5ffde2582ad9b996f1bac8b5b282e9f13953fa (patch) | |
tree | 5588535295efdcd7af49fe27f69f1e48593596f9 /gitattributes.html | |
parent | 6bc98f21acd99c9e21d29b44300620a04ae9442d (diff) | |
download | git-htmldocs-fb5ffde2582ad9b996f1bac8b5b282e9f13953fa.tar.gz |
Autogenerated HTML docs for v2.2.0-rc0-2-gf745ac
Diffstat (limited to 'gitattributes.html')
-rw-r--r-- | gitattributes.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitattributes.html b/gitattributes.html index dd8cc5771..9b6d331c8 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -1480,7 +1480,7 @@ data by examining the beginning of the contents. However, sometimes you may want to override its decision, either because a blob contains binary
data later in the file, or because the content, while technically
composed of text characters, is opaque to a human reader. For example,
-many postscript files contain only ascii characters, but produce noisy
+many postscript files contain only ASCII characters, but produce noisy
and meaningless diffs.</p></div>
<div class="paragraph"><p>The simplest way to mark a file as binary is to unset the diff
attribute in the <code>.gitattributes</code> file:</p></div>
@@ -1492,7 +1492,7 @@ attribute in the <code>.gitattributes</code> file:</p></div> patch, if binary patches are enabled) instead of a regular diff.</p></div>
<div class="paragraph"><p>However, one may also want to specify other diff driver attributes. For
example, you might want to use <code>textconv</code> to convert postscript files to
-an ascii representation for human viewing, but otherwise treat them as
+an ASCII representation for human viewing, but otherwise treat them as
binary files. You cannot specify both <code>-diff</code> and <code>diff=ps</code> attributes.
The solution is to use the <code>diff.*.binary</code> config option:</p></div>
<div class="listingblock">
@@ -1855,7 +1855,7 @@ frotz unspecified</code></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-09-11 14:53:10 PDT
+Last updated 2014-11-04 14:37:41 PST
</div>
</div>
</body>
|