############################################################################### # Set default behavior to automatically normalize line endings. ############################################################################### * text=auto *.sh text eol=lf ############################################################################### # Set default behavior for command prompt diff. # # This is need for earlier builds of msysgit that does not have it on by # default for csharp files. # Note: This is only used by command line ############################################################################### #*.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files # # Merging from the command prompt will add diff markers to the files if there # are conflicts (Merging from VS is not affected by the settings below, in VS # the diff markers are never inserted). Diff markers may cause the following # file extensions to fail to load in VS. An alternative would be to treat # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below ############################################################################### #*.sln merge=binary #*.csproj merge=binary #*.vbproj merge=binary #*.vcxproj merge=binary #*.vcproj merge=binary #*.dbproj merge=binary #*.fsproj merge=binary #*.lsproj merge=binary #*.wixproj merge=binary #*.modelproj merge=binary #*.sqlproj merge=binary #*.wwaproj merge=binary ############################################################################### # behavior for image, zip & pfx files # # image files are treated as binary by default. ############################################################################### #*.jpg binary #*.png binary #*.gif binary *.pfx binary *.zip binary *.woff binary ############################################################################### # diff behavior for common document formats # # Convert binary document formats to text before diffing them. This feature # is only available from the command line. Turn it on by uncommenting the # entries below. ############################################################################### #*.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 ======= # Auto detect text files and perform CRLF normalization * text=auto eol=crlf # 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 *.md text *.DotSettings text *.txt text eol=crlf *.bat text eol=crlf # Custom for Visual Studio *.suo -text -diff *.snk -text -diff *.cub -text -diff *.wixlib -text -diff