[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d0848f8: Update .gitattributes for DOS EOL files
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master d0848f8: Update .gitattributes for DOS EOL files |
Date: |
Mon, 01 Jun 2015 15:03:45 +0000 |
branch: master
commit d0848f8ddee353c99409caf1dd25e003c8b5af98
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Update .gitattributes for DOS EOL files
* .gitattributes: Use "whitespace=cr-at-eol" for files with DOS
CRLF end-of-line format.
---
.gitattributes | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 4bcb7be..21af4e6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,16 +19,16 @@
# A few files use CRLF endings, even on non-Microsoft platforms.
# Do not warn about trailing whitespace with these files.
-*.bat -whitespace
-admin/charsets/mapfiles/PTCP154 -whitespace
-leim/MISC-DIC/cangjie-table.b5 -whitespace
-leim/MISC-DIC/cangjie-table.cns -whitespace
-leim/MISC-DIC/pinyin.map -whitespace
-lib-src/update-game-score.exe.manifest -whitespace
-nt/nmake.defs -whitespace
-test/etags/c-src/dostorture.c -whitespace
-test/etags/cp-src/c.C -whitespace
-test/etags/html-src/algrthms.html -whitespace
+*.bat whitespace=cr-at-eol
+admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
+leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
+leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
+leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
+lib-src/update-game-score.exe.manifest whitespace=cr-at-eol
+nt/nmake.defs whitespace=cr-at-eol
+test/etags/c-src/dostorture.c whitespace=cr-at-eol
+test/etags/cp-src/c.C whitespace=cr-at-eol
+test/etags/html-src/algrthms.html whitespace=cr-at-eol
# The upstream maintainer does not want to remove trailing whitespace.
doc/misc/texinfo.tex -whitespace=blank-at-eol
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d0848f8: Update .gitattributes for DOS EOL files,
Eli Zaretskii <=