diff options
| author | Eli Zaretskii | 2015-06-01 18:01:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-06-01 18:01:49 +0300 |
| commit | d0848f8ddee353c99409caf1dd25e003c8b5af98 (patch) | |
| tree | dbce01ef0f50b247ea6afe128197033ed3509e2f | |
| parent | e8f586be329b7b7c324a14da8be0c6b8c890e34b (diff) | |
| download | emacs-d0848f8ddee353c99409caf1dd25e003c8b5af98.tar.gz emacs-d0848f8ddee353c99409caf1dd25e003c8b5af98.zip | |
Update .gitattributes for DOS EOL files
* .gitattributes: Use "whitespace=cr-at-eol" for files with DOS
CRLF end-of-line format.
| -rw-r--r-- | .gitattributes | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitattributes b/.gitattributes index 4bcb7be7377..21af4e68770 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -19,16 +19,16 @@ | |||
| 19 | 19 | ||
| 20 | # A few files use CRLF endings, even on non-Microsoft platforms. | 20 | # A few files use CRLF endings, even on non-Microsoft platforms. |
| 21 | # Do not warn about trailing whitespace with these files. | 21 | # Do not warn about trailing whitespace with these files. |
| 22 | *.bat -whitespace | 22 | *.bat whitespace=cr-at-eol |
| 23 | admin/charsets/mapfiles/PTCP154 -whitespace | 23 | admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol |
| 24 | leim/MISC-DIC/cangjie-table.b5 -whitespace | 24 | leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol |
| 25 | leim/MISC-DIC/cangjie-table.cns -whitespace | 25 | leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol |
| 26 | leim/MISC-DIC/pinyin.map -whitespace | 26 | leim/MISC-DIC/pinyin.map whitespace=cr-at-eol |
| 27 | lib-src/update-game-score.exe.manifest -whitespace | 27 | lib-src/update-game-score.exe.manifest whitespace=cr-at-eol |
| 28 | nt/nmake.defs -whitespace | 28 | nt/nmake.defs whitespace=cr-at-eol |
| 29 | test/etags/c-src/dostorture.c -whitespace | 29 | test/etags/c-src/dostorture.c whitespace=cr-at-eol |
| 30 | test/etags/cp-src/c.C -whitespace | 30 | test/etags/cp-src/c.C whitespace=cr-at-eol |
| 31 | test/etags/html-src/algrthms.html -whitespace | 31 | test/etags/html-src/algrthms.html whitespace=cr-at-eol |
| 32 | 32 | ||
| 33 | # The upstream maintainer does not want to remove trailing whitespace. | 33 | # The upstream maintainer does not want to remove trailing whitespace. |
| 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol | 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol |