aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorZac Pullar-Strecker <zacmps@gmail.com>2020-07-31 03:12:44 +0100
committerZac Pullar-Strecker <zacmps@gmail.com>2020-07-31 03:12:44 +0100
commitf05d7b41a719d848844b054a16477b29d0f063c6 (patch)
tree0a8a0946e8aef2ce64d4c13d0035ba41cce2daf3 /.gitattributes
parent73ff610e41959e3e7c78a2b4b25b086883132956 (diff)
parent6b7cb8b5ab539fc4333ce34bc29bf77c976f232a (diff)
Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links
Hasn't fixed tests yet.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index e749e1dc9..4cd50e481 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,6 @@
1* text=auto eol=lf 1* text=auto eol=lf
2crates/ra_syntax/test_data/** -text eof=LF 2crates/ra_syntax/test_data/** -text eof=LF
3# Older git versions try to fix line endings on images, this prevents it.
4*.png binary
5*.jpg binary
6*.ico binary