auto merge of #13748 : hjr3/rust/guide-container-update, r=alexcrichton

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 10505d47e6c5d6d092d1b2fa619760df8055bc1a..052341b5845bef97fccbba7667a1d686625b4875 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,11 @@
 [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-* text=auto
+* text=auto eol=lf
 *.cpp rust
 *.h rust
 *.rs rust
+src/etc/pkg/rust-logo.ico binary
+src/etc/pkg/rust-logo.png binary
 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