diff options
author | Thomas Ackermann <th.acker@arcor.de> | 2014-11-03 23:37:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-05 00:14:44 +0300 |
commit | f745acb028ee8f7dcd1c8f10127b8feeaa255cf7 (patch) | |
tree | 664ed49a136f9e91d8e0cd58ef01576876ad10c0 /Documentation/gitattributes.txt | |
parent | dd83521629d95d0c8e4aff85edb16715a13689a3 (diff) |
Documentation: typofixes
In addition to fixing trivial and obvious typos, be careful about
the following points:
- Spell ASCII, URL and CRC in ALL CAPS;
- Spell Linux as Capitalized;
- Do not omit periods in "i.e." and "e.g.".
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r-- | Documentation/gitattributes.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 9b45bda748..c892ffa5ce 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -665,7 +665,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. The simplest way to mark a file as binary is to unset the diff @@ -680,7 +680,7 @@ patch, if binary patches are enabled) instead of a regular diff. However, one may also want to specify other diff driver attributes. For example, you might want to use `textconv` 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 `-diff` and `diff=ps` attributes. The solution is to use the `diff.*.binary` config option: |