about summary refs log tree commit diff
path: root/.gitattributes
diff options
context:
space:
mode:
authoradridu59 <adri-from-59@hotmail.fr>2013-09-15 23:32:18 +0200
committeradridu59 <adri-from-59@hotmail.fr>2013-09-16 17:16:33 +0200
commit62991e604731467c04cd8c652f027930ac758fc9 (patch)
tree9e243815a2fa1c97fb15c7deb0d573ac0f33ae86 /.gitattributes
parent29032cda8c7b97966c7f3a9380bcaa8439596cd8 (diff)
downloadrust-62991e604731467c04cd8c652f027930ac758fc9.tar.gz
rust-62991e604731467c04cd8c652f027930ac758fc9.zip
gitattributes: force LF line endings for all files
This avoids default CRLF on msysgit for Windows which can cause trouble.
Cf. https://help.github.com/articles/dealing-with-line-endings#text-eollf

Commit dad2ccc9b3b27d3f438eeea53b771cc85f6dfa32 followup.
Closes #7723.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
index 10505d47e6c..70b2a5cd90e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-* text=auto
+* text eol=lf
 *.cpp rust
 *.h rust
 *.rs rust
@@ -8,6 +8,3 @@ src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace
 src/rt/jemalloc/**/* -whitespace
-src/rt/jemalloc/include/jemalloc/jemalloc.h.in text eol=lf
-src/rt/jemalloc/include/jemalloc/jemalloc_defs.h.in text eol=lf
-src/rt/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in text eol=lf