Skip to content

Commit

Permalink
Fix up .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
anaisbetts committed Sep 15, 2012
1 parent 8c942ef commit 3a97b90
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Auto detect text files and perform LF normalization
* text eol=crlf
* text

*.xml text eol=crlf
*.targets text eol=crlf
# Don't check these into the repo as LF to work around TeamCity bug
*.xml -text
*.targets -text

# Custom for Visual Studio
*.cs diff=csharp
Expand All @@ -12,19 +13,5 @@
*.fsproj merge=union
*.dbproj 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

# Denote all files that are truly binary and should not be modified.
*.dll binary
*.exe binary
*.snk binary
*.snk binary

0 comments on commit 3a97b90

Please sign in to comment.