Permalink
Browse files

change order

  • Loading branch information...
1 parent 3df1429 commit f87a11835e5b0092bc9b062de8bc4abbdecf808e @onovotny committed Oct 31, 2012
Showing with 28 additions and 14 deletions.
  1. +28 −13 .gitattributes
  2. +0 −1 .gitignore
View
@@ -1,35 +1,50 @@
# Auto detect text files and perform LF normalization
+* text=auto
[attr]utf16 diff merge -crlf
-* text=auto
+*.cs text diff=csharp
+*.csproj text merge=union
+*.dbproj merge=union
+*.vbproj text merge=union
+*.vcxproj text merge=union
+*.resw text merge=union
+*.resx text merge=union
+*.vsixmanifest text
+*.vstemplate text
+*.sln text eol=crlf merge=union
+*.vb text
+*.fsproj merge=union
+*.manifest text
+*.msbuild text
+
*.ico binary
*.snk binary
*.xls binary
*.bat text
*.config text
-*.cs text diff=csharp
-*.csproj text merge=union
-*.fsproj merge=union
-*.manifest text
-*.msbuild text
*.nuspec text
-*.resw text merge=union
-*.resx text merge=union
*.ruleset text
*.settings text
*.shfb text
*.targets text
*.tdnet text
*.txt text
-*.vb text
-*.vbproj text merge=union
-*.vsixmanifest text
-*.vstemplate text
*.xml text
*.xsl text
*.xslt text
-*.sln text eol=crlf merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
View
@@ -10,7 +10,6 @@
[Tt]humbs.db
_ReSharper.*
*.resharper
-Ankh.NoLoad
*.mdb
/TestResults
/packages

0 comments on commit f87a118

Please sign in to comment.