-
Notifications
You must be signed in to change notification settings - Fork 300
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
842eb4c
commit d575e1d
Showing
1 changed file
with
67 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,73 @@ | ||
| # Auto detect text files and perform LF normalization | ||
| * text | ||
| # Auto detect text files and perform CRLF normalization | ||
| * text=auto eol=crlf | ||
|
|
||
| # Don't check these into the repo as LF to work around TeamCity bug | ||
| *.xml -text | ||
| *.targets -text | ||
| *.md -text | ||
| # 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 | ||
|
|
||
| *.exe -text -diff | ||
| *.jpg -text -diff | ||
| *.png -text -diff | ||
| *.gif -text -diff | ||
| *.dll -text -diff | ||
| *.pdb -text -diff | ||
| *.pptx -text -diff | ||
| *.xap -text -diff | ||
| *.ico -text -diff | ||
| *.ttf -text -diff | ||
| *.otf -text -diff | ||
|
|
||
| *.cs text diff=csharp | ||
| *.config text diff=csharp | ||
| *.xml text diff=csharp | ||
| *.vb text | ||
| *.c text | ||
| *.cpp text | ||
| *.cxx text | ||
| *.h text | ||
| *.hxx text | ||
| *.py text | ||
| *.rb text | ||
| *.java text | ||
| *.html text | ||
| *.htm text | ||
| *.css text | ||
| *.scss text | ||
| *.sass text | ||
| *.less text | ||
| *.js text | ||
| *.lisp text | ||
| *.clj text | ||
| *.sql text | ||
| *.php text | ||
| *.lua text | ||
| *.m text | ||
| *.asm text | ||
| *.erl text | ||
| *.fs text | ||
| *.fsx text | ||
| *.hs text | ||
| *.targets text | ||
| *.psm1 text | ||
| *.ps1 text | ||
| *.txt text eol=crlf | ||
| *.bat text eol=crlf | ||
|
|
||
| # Custom for Visual Studio | ||
| *.cs diff=csharp | ||
| *.sln merge=union | ||
| *.csproj merge=union | ||
| *.vbproj merge=union | ||
| *.fsproj merge=union | ||
| *.dbproj merge=union | ||
|
|
||
| # Denote all files that are truly binary and should not be modified. | ||
| *.dll binary | ||
| *.exe binary | ||
| *.png binary | ||
| *.ico binary | ||
| *.snk binary | ||
| *.pdb binary | ||
| *.svg binary | ||
| *.jpg binary | ||
| *.dbproj merge=union | ||
| *.sln text eol=crlf merge=union | ||
| *.suo -text -diff | ||
| *.snk -text -diff | ||
| *.cub -text -diff | ||
| *.wixlib -text -diff |