diff options
| author | Paul Eggert | 2015-05-30 09:33:41 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-05-30 09:34:37 -0700 |
| commit | e553c503f4d71e60db1f382c8d9d2348e7b20887 (patch) | |
| tree | d2fee767986a84cff6e2c6def71f35f9c9c880c3 | |
| parent | 83c7e62a3047d6d0e951b51d5114608ba735945a (diff) | |
| download | emacs-e553c503f4d71e60db1f382c8d9d2348e7b20887.tar.gz emacs-e553c503f4d71e60db1f382c8d9d2348e7b20887.zip | |
Update .gitattributes to match current sources
http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html
* .gitattributes: Accommodate tests that insist on DOS format.
Remove test/automated/data/decompress/foo-gzipped.
Add etc/e/eterm-color.
| -rw-r--r-- | .gitattributes | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index c3bbf664ceb..4bcb7be7377 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -26,6 +26,9 @@ leim/MISC-DIC/cangjie-table.cns -whitespace | |||
| 26 | leim/MISC-DIC/pinyin.map -whitespace | 26 | 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 | test/etags/c-src/dostorture.c -whitespace | ||
| 30 | test/etags/cp-src/c.C -whitespace | ||
| 31 | test/etags/html-src/algrthms.html -whitespace | ||
| 29 | 32 | ||
| 30 | # The upstream maintainer does not want to remove trailing whitespace. | 33 | # The upstream maintainer does not want to remove trailing whitespace. |
| 31 | doc/misc/texinfo.tex -whitespace=blank-at-eol | 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol |
| @@ -40,4 +43,4 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol | |||
| 40 | *.png binary | 43 | *.png binary |
| 41 | *.sig binary | 44 | *.sig binary |
| 42 | *.tiff binary | 45 | *.tiff binary |
| 43 | test/automated/data/decompress/foo-gzipped binary | 46 | etc/e/eterm-color binary |