diff options
| author | Paul Eggert | 2015-02-03 18:24:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-02-03 18:26:19 -0800 |
| commit | 5b82ae859936ec786ffb7dbefb28500587c34e5a (patch) | |
| tree | 6ea3698adcf38c450daa10dadc3bd5aa05d13c33 /.gitattributes | |
| parent | 200a47d45cf8550e5995dd23025acaf3edf81b4a (diff) | |
| download | emacs-5b82ae859936ec786ffb7dbefb28500587c34e5a.tar.gz emacs-5b82ae859936ec786ffb7dbefb28500587c34e5a.zip | |
* .gitattributes: Ignore blanks at EOL in texinfo.tex.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index c568ba293da..c3bbf664ceb 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -27,6 +27,9 @@ leim/MISC-DIC/pinyin.map -whitespace | |||
| 27 | lib-src/update-game-score.exe.manifest -whitespace | 27 | lib-src/update-game-score.exe.manifest -whitespace |
| 28 | nt/nmake.defs -whitespace | 28 | nt/nmake.defs -whitespace |
| 29 | 29 | ||
| 30 | # The upstream maintainer does not want to remove trailing whitespace. | ||
| 31 | doc/misc/texinfo.tex -whitespace=blank-at-eol | ||
| 32 | |||
| 30 | # Some files should not be treated as text when diffing or merging. | 33 | # Some files should not be treated as text when diffing or merging. |
| 31 | *.gpg binary | 34 | *.gpg binary |
| 32 | *.gz binary | 35 | *.gz binary |