diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-03 18:24:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-03 18:26:19 -0800 |
| commit | 5b82ae859936ec786ffb7dbefb28500587c34e5a (patch) | |
| tree | 6ea3698adcf38c450daa10dadc3bd5aa05d13c33 | |
| parent | 200a47d45cf8550e5995dd23025acaf3edf81b4a (diff) | |
| download | emacs-5b82ae859936ec786ffb7dbefb28500587c34e5a.tar.gz | |
* .gitattributes: Ignore blanks at EOL in texinfo.tex.
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | ChangeLog | 4 |
2 files changed, 7 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 diff --git a/ChangeLog b/ChangeLog index d7fd76cd305..ca9f44aacf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-02-04 Paul Eggert <eggert@cs.ucla.edu> + + * .gitattributes: Ignore blanks at EOL in texinfo.tex. + 2015-01-28 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib and try to repair bad merge |