summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-02-03 18:24:50 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-02-03 18:26:19 -0800
commit5b82ae859936ec786ffb7dbefb28500587c34e5a (patch)
tree6ea3698adcf38c450daa10dadc3bd5aa05d13c33 /.gitattributes
parent200a47d45cf8550e5995dd23025acaf3edf81b4a (diff)
downloademacs-5b82ae859936ec786ffb7dbefb28500587c34e5a.tar.gz
* .gitattributes: Ignore blanks at EOL in texinfo.tex.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
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
lib-src/update-game-score.exe.manifest -whitespace
nt/nmake.defs -whitespace
+# The upstream maintainer does not want to remove trailing whitespace.
+doc/misc/texinfo.tex -whitespace=blank-at-eol
+
# Some files should not be treated as text when diffing or merging.
*.gpg binary
*.gz binary