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

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 52370e4a509b0f3a3c642a560fb036aac0262687..052341b5845bef97fccbba7667a1d686625b4875 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +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