summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-09-02 12:37:52 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-09-02 12:38:49 -0700
commitfda015e7b82a1ec3d1cb075799a67772744ce6c1 (patch)
treefd24150923a0afb809cfcf063c454b3e1aacdf7a /.gitattributes
parent7c37b17b3d6a9be06fa25b19f5eccbc72c52f71c (diff)
downloademacs-fda015e7b82a1ec3d1cb075799a67772744ce6c1.tar.gz
Update from Gnulib
This incorporates: 2019-08-25 intprops.h, verify.h: port better to clang 2019-08-21 New strip-trailing-space option for srclist-update * .gitattributes: Remove doc/misc/texinfo.tex special case, which is no longer needed now that Gnulib trims blank-at-eol. * build-aux/install-sh, doc/misc/texinfo.tex, lib/intprops.h: * lib/regex_internal.c, lib/verify.h: Copy from Gnulib.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 65a943f6954..e1fd4b12a8a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,9 +31,6 @@ test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
# The todo-mode file format includes trailing whitespace.
*.tod[aorty] -whitespace=blank-at-eol
-# 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.
*.cur binary
*.gpg binary