Some new ideas for global gitattributes

etc/gitattributes

@@ -1,6 +1,14 @@
 # Catch all. Add rules if you get CRLF to LF warnings.
 * text=auto
 
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
 # Standard to msysgit
 *.doc	 diff=astextplain
 *.DOC	 diff=astextplain

etc/gitattributes-suggested

@@ -1,76 +0,0 @@
-# Catch all. Add rules if you get CRLF to LF warnings.
-* text=auto
-
-# Text files that should be normalized to LF in the odb.
-*.cs     text=auto diff=csharp
-*.xaml   text=auto
-*.config text=auto
-*.vb     text=auto
-*.c      text=auto
-*.cpp    text=auto
-*.cxx    text=auto
-*.h      text=auto
-*.hxx    text=auto
-*.py     text=auto
-*.rb     text=auto
-*.htm    text=auto
-*.css    text=auto
-*.js     text=auto
-*.bat    text=auto
-*.cmd    text=auto
-*.ps1    text=auto
-*.tt     text=auto
-*.clj    text=auto
-*.sql    text=auto
-*.php    text=auto
-*.lua    text=auto
-*.m      text=auto
-*.asm    text=auto
-*.erl    text=auto
-*.fs     text=auto
-*.fsx    text=auto
-*.hs     text=auto
-*.java   text=auto
-*.html   text=auto
-*.lisp   text=auto
-*.scss   text=auto
-*.sass   text=auto
-*.less   text=auto
-
-*.markdown text=auto
-*.mustache text=auto
-*.msbuild  text=auto
-
-*.sln    text=auto eol=crlf merge=union
-*.csproj text=auto merge=union
-*.vbproj text=auto merge=union
-*.fsproj text=auto merge=union
-*.dbproj text=auto merge=union
-
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.doc  diff=astextplain
-*.DOC  diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF  diff=astextplain
-*.rtf  diff=astextplain
-*.RTF  diff=astextplain
-
-# Binary files that should not be normalized or diffed.
-*.jpg    binary
-*.png    binary
-*.gif    binary
-*.ico    binary
-*.rc     binary
-
-*.pfx    binary
-*.snk    binary
-*.dll    binary
-*.exe    binary
-*.lib    binary
-*.exp    binary
-*.pdb    binary
-*.sdf    binary
-*.7z     binary