diff options
| author | bradwilson <dotnetguy@gmail.com> | 2012-03-31 10:12:25 +0400 |
|---|---|---|
| committer | bradwilson <dotnetguy@gmail.com> | 2012-03-31 10:12:25 +0400 |
| commit | de1978456b768eb211053f489b0a52876647a8be (patch) | |
| tree | dafb5add6122cbeb3a5a6be13cc8944438102745 /.gitattributes | |
| parent | 9f79e577d4b9a70b1e958afc305be2e4c784a604 (diff) | |
Updated .gitattributes with the file types used in the project
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 72 |
1 files changed, 33 insertions, 39 deletions
diff --git a/.gitattributes b/.gitattributes index 7b90091e..e2d3d2ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,49 +1,43 @@ -*.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 +*.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 -*.jpg binary -*.png binary -*.gif binary +*.bmp binary +*.gif binary +*.jpg binary +*.png binary +*.ascx text +*.cmd text +*.coffee text +*.config text *.cs text diff=csharp -*.vb text -*.c text -*.cpp text -*.cxx text -*.h text -*.hxx text -*.py text -*.rb text -*.java text +*.css text +*.cshtml text +*.htm 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 +*.msbuild text +*.resx text +*.ruleset text +*.Stylecop text +*.targets text +*.tt text +*.txt text +*.vb text +*.vbhtml text +*.xml text +*.xunit text *.csproj text merge=union *.vbproj text merge=union -*.fsproj text merge=union -*.dbproj text merge=union + *.sln text eol=crlf merge=union |