Created
October 15, 2013 14:06
-
-
Save asapostolov/6992121 to your computer and use it in GitHub Desktop.
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
# Auto detect text files and perform LF normalization | |
* text=auto | |
# These files are text and should be normalized (convert crlf => lf) | |
*.cs text diff=csharp | |
*.java text diff=java | |
*.html text diff=html | |
*.js text | |
*.cshtml text | |
*.xaml text | |
*.csproj text | |
*.sln text | |
*.tt text | |
*.ps1 text | |
*.cmd text | |
*.msbuild text | |
*.md text | |
*.po text | |
# Images should be treated as binary | |
# (binary is a macro for -text -diff) | |
*.png binary | |
*.jepg binary | |
*.sdf binary | |
*.exe binary | |
*.dll binary | |
# 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 | |
*.docx diff=astextplain | |
*.DOCX diff=astextplain | |
*.dot diff=astextplain | |
*.DOT diff=astextplain | |
*.pdf diff=astextplain | |
*.PDF diff=astextplain | |
*.rtf diff=astextplain | |
*.RTF diff=astextplain | |
*.po diff=po |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment