[Emacs-diffs] master 5b82ae8 1/2: * .gitattributes: Ignore blanks at EOL in texinfo.tex.

[Paul Eggert]

branch: master
commit 5b82ae859936ec786ffb7dbefb28500587c34e5a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    * .gitattributes: Ignore blanks at EOL in texinfo.tex.
---
 .gitattributes |    3 +++
 ChangeLog      |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index c568ba2..c3bbf66 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
diff --git a/ChangeLog b/ChangeLog
index d7fd76c..ca9f44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-04  Paul Eggert  <address@hidden>
+
+       * .gitattributes: Ignore blanks at EOL in texinfo.tex.
+
 2015-01-28  Paul Eggert  <address@hidden>
 
        Merge from gnulib and try to repair bad merge