diff options
| author | madmaxoft <github@xoft.cz> | 2013-11-27 09:32:28 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-11-27 09:32:53 +0100 |
| commit | 557ebc88d710d7b69865a226d0bd87de702afe93 (patch) | |
| tree | 0f39912189595dcf991b6ff2eeb0e674f2f179ab /.gitattributes | |
| parent | Merge pull request #370 from mc-server/foldermove2 (diff) | |
| download | cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar.gz cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar.bz2 cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar.lz cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar.xz cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.tar.zst cuberite-557ebc88d710d7b69865a226d0bd87de702afe93.zip | |
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 1ff0c4230..000000000 --- a/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# 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 files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif 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 |