Added .gitattributes

2012-11-15 20:02:56 +00:00
parent c1ff6a2d44
commit 2d33a9ecd0
1 changed files with 21 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,21 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.c      text
+*.cpp    text
+*.cs     text diff=csharp
+*.css    text
+*.h      text
+*.hpp    text
+*.html   text diff=html
+*.java   text diff=java
+*.js     text
+*.less   text
+*.sql    text
+*.xml    text
+
+*.csproj text merge=union
+*.sln    text merge=union eol=crlf
+
+*.docx   diff=astextplain
+*.DOCX   diff=astextplain