summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-01-23 11:54:23 +0100
committerPietro Albini <pietro@pietroalbini.org>2019-01-23 12:44:15 +0100
commit645b7c2c36a3d71de69af51a29a0d4d832b95cbd (patch)
tree1893cea569c8f07216219e48bc058050b9603a95 /.gitattributes
parent6bba352cad2117f56353d400f71e96eafa2e6bd7 (diff)
downloadrust-645b7c2c36a3d71de69af51a29a0d4d832b95cbd.tar.gz
ignore images line ending on older git versions
On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of .png and .ico files, and obviously it ruins them. This commit adds an attribute to those files to properly mark them as binary.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index b223c8ac5fb..f0b1c67bd0f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,7 @@ src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock -merge linguist-generated=false
+
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.ico binary