diff --git a/.gitattributes b/.gitattributes
index 7353614049..637f5e4cc2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,28 @@
 * text=auto
 * text eol=lf
+
+# Windows forced line-endings
+/.idea/* text eol=crlf
+
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.pdf binary
+*.ez binary
+*.bz2 binary
+*.swp binary