1
0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00

Merge pull request #89 from Richienb/patch-3

Add CSS diff support
This commit is contained in:
Alexander Karatarakis 2019-04-17 15:51:28 -07:00 committed by GitHub
commit 0f6c2ca29c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 7 deletions

View File

@ -7,7 +7,7 @@
#
# These files are text and should be normalized (Convert crlf => lf)
*.bal text
*.css text
*.css text diff=css
*.df text
*.htm text
*.html text
@ -33,4 +33,3 @@
*.jpeg binary
*.png binary
*.so binary

View File

@ -19,7 +19,7 @@
# Auto-detect text files, ensure they use LF.
* text=auto eol=lf
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=css
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php

View File

@ -38,4 +38,3 @@
*.png binary
*.so binary
*.war binary

View File

@ -7,4 +7,4 @@
# Luadoc output
# =============
*.html text
*.css text
*.css text diff=css

View File

@ -7,5 +7,5 @@
*.obj -text
*.dbi -text
*.sec -text
*.css -text
*.js eol=lf
*.css -text diff=css
*.js eol=lf