diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-13 17:59:22 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-13 17:59:22 +0000 |
| commit | 83d8d49dc361e8903e316db12d188e061eeb200d (patch) | |
| tree | 9f5c24d935cb2ff0411ca6090d41f1e9e7ef3618 /.gitattributes | |
| parent | f6d60bfc3793101d0465e5c1feb79ff8547ee15e (diff) | |
| download | FMark-83d8d49dc361e8903e316db12d188e061eeb200d.tar.gz FMark-83d8d49dc361e8903e316db12d188e061eeb200d.zip | |
[Clean] cleaning repo and adding examples directory
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 885859e..a8ff2a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,65 @@ +############################################################################### +# 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 + FMark/js/*.js linguist-vendored=true
\ No newline at end of file |