Permalink
Browse files

Added .gitattributes

  • Loading branch information...
1 parent c1ff6a2 commit 2d33a9ecd0160b94a382dbd86bf88793267cbdc5 @wickedest committed Nov 15, 2012
Showing with 21 additions and 0 deletions.
  1. +21 −0 .gitattributes
View
@@ -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

0 comments on commit 2d33a9e

Please sign in to comment.