diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..78bd25b8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+* text eol=lf
+*.jpg binary
+*.png binary
+*.gif binary
+
+CHANGELOG.md merge=union