Permalink
Browse files

Remove BOM and cleanup .gitattributes

There is no need to call out Lib and other directories specifically in here
because we have .gitattributes files in those dirs.
  • Loading branch information...
1 parent adf32bc commit 5f55b57123e45f94a87d97661d5265a1b7bf8ef4 @tclem tclem committed with nulltoken Jun 1, 2012
Showing with 5 additions and 34 deletions.
  1. +5 −34 .gitattributes
View
@@ -1,36 +1,7 @@
-# Catch all for anything we forgot. Add rules if you get CRLF to LF warnings.
+# Auto detect text files and perform LF normalization
* text=auto
-# Text files that should be normalized to LF in odb.
-*.cs text diff=csharp
-*.config text
-
-*.sln text
-*.csproj text
-
-*.md text
-*.sh text
-*.ps1 text
-*.cmd text
-*.bat text
-*.markdown text
-*.msbuild text
-
-Lib/* binary
-GitHub.Tests.Integration/Resources/* binary
-
-
-# Binary files that should not be normalized or diffed
-*.png binary
-*.jpg binary
-*.gif binary
-
-*.pfx binary
-*.snk binary
-*.dll binary
-*.exe binary
-*.lib binary
-*.exp binary
-*.pdb binary
-*.sdf binary
-*.7z binary
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union

0 comments on commit 5f55b57

Please sign in to comment.