.gitattributes & .gitignore rewritten

1 files changed, 23 insertions, 10 deletions

diff --git a/.gitattributes b/.gitattributes
index 0a6781fd8..06374b854 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,21 +1,34 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
-# Explicitly declare text files we want to always be normalized and converted 
+# Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
-*.py text
-*.js text
-*.po text
 *.cfg text
-*.md text
+*.coffee text
+*.conf text
+*.htm text
+*.html text
 *.in text
-*.txt text
-*.sh text
+*.js text
 *.json text
-*.html text
-.htm text
+*.md text
+*.po text
+*.pot text
+*.py text
+*.rst text
+*.sh text
+*.thrift text
+*.txt text
+*.yaml text
+*.xml text
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
+*.ico binary
+*.gif binary
 *.jpg binary
 *.mo binary
+*.pyc binary
+*.png binary
+*.svg binary
+*.rar binary
+*.zip binary