diff options
| author | lempamo <[email protected]> | 2017-06-11 22:27:24 -0400 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-06-11 22:27:24 -0400 |
| commit | a307bc7f45b29ef8a6a5de83a98c457c7875f116 (patch) | |
| tree | 5a1a8fbb9cfc88b34d587e6230980d35edf787f9 /.gitattributes | |
| parent | 98485ebbbca1210fdc0d4b81008802481cd62c17 (diff) | |
| parent | a2053d72ddd8a954c4798ba89fda03bb913842d1 (diff) | |
| download | histacom2-a307bc7f45b29ef8a6a5de83a98c457c7875f116.tar.gz histacom2-a307bc7f45b29ef8a6a5de83a98c457c7875f116.tar.bz2 histacom2-a307bc7f45b29ef8a6a5de83a98c457c7875f116.zip | |
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 142 |
1 files changed, 65 insertions, 77 deletions
diff --git a/.gitattributes b/.gitattributes index 8e32b91..130cddb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,77 +1,65 @@ -* text=auto - - - -# - -# The above will handle all files NOT found below - -# - -# These files are text and should be normalized (Convert crlf => lf) - -*.css text - -*.df text - -*.htm text - -*.html text - -*.java text - -*.js text - -*.json text - -*.jsp text - -*.jspf text - -*.jspx text - -*.properties text - -*.sh text - -*.tld text - -*.txt text - -*.tag text - -*.tagx text - -*.xml text - -*.yml text - -*.sh text - -# These files are binary and should be left untouched - -# (binary is a macro for -text -diff) - -*.class binary - -*.dll binary - -*.ear binary - -*.gif binary - -*.ico binary - -*.jar binary - -*.jpg binary - -*.jpeg binary - -*.png binary - -*.so binary - -*.war binary - -*.exe binary +# Normalise line endings +* text=auto + +# Common Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/Common.gitattributes +# - Documents +*.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 +*.md text +*.adoc text +*.textile text +*.mustache text +*.csv text +*.tab text +*.tsv text +*.sql text + +# - Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +# Might want to treat svg as text +*.svg binary +*.eps binary + +# C# Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/CSharp.gitattributes +*.cs diff=csharp + +# Visual Studio Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/VisualStudio.gitattributes +*.sln text eol=crlf +*.csproj text eol=crlf +*.vbproj text eol=crlf +*.vcxproj text eol=crlf +*.vcproj text eol=crlf +*.dbproj text eol=crlf +*.fsproj text eol=crlf +*.lsproj text eol=crlf +*.wixproj text eol=crlf +*.modelproj text eol=crlf +*.sqlproj text eol=crlf +*.wmaproj text eol=crlf + +*.xproj text eol=crlf +*.props text eol=crlf +*.filters text eol=crlf +*.vcxitems text eol=crlf + +# Extra Settings +*.dll binary +*.lib binary +*.exe binary |