Ensure CRLF stays out of the repo

Looks like I already failed that project a little :)

(cherry picked from commit 066771b2d15748edc72095b75c4626bf445266aa)
This commit is contained in:
Octavia Togami
2020-08-15 06:46:24 -04:00
committed by MattBDev
parent fd336feb46
commit 034b910d57
3 changed files with 243 additions and 203 deletions

36
.gitattributes vendored
View File

@ -1,2 +1,34 @@
*.java diff=java
#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead
* text=auto
# Force Batch files to CRLF
*.bat text=crlf
# Java sources
*.java text diff=java
*.kt text diff=java
*.gradle text diff=java
*.gradle.kts text diff=java
# These files are text and should be normalized (Convert crlf => lf)
*.css text diff=css
*.df text
*.htm text diff=html
*.html text diff=html
*.js text
*.jsp text
*.jspf text
*.jspx text
*.properties text
*.tld text
*.tag text
*.tagx text
*.xml text
# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.class binary
*.dll binary
*.ear binary
*.jar binary
*.so binary
*.war binary
*.jks binary