]> git.lizzy.rs Git - rust.git/blobdiff - .gitattributes
auto merge of #13748 : hjr3/rust/guide-container-update, r=alexcrichton
[rust.git] / .gitattributes
index 70b2a5cd90ea032c72b119633e6d5f6b94aea76b..052341b5845bef97fccbba7667a1d686625b4875 100644 (file)
@@ -1,10 +1,11 @@
 [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-* text eol=lf
+* 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