summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-20 14:49:47 -0700
committerPaul Phillips <paulp@improving.org>2012-09-20 15:07:35 -0700
commit0a1f923087267b2d9da100c6261e699f5bd7eeb0 (patch)
treec07b1740c0799029d98819a202fcca792dafc4a1 /.gitattributes
parent2097a653642927c39b1cb614546240ac9213f3fb (diff)
downloadscala-0a1f923087267b2d9da100c6261e699f5bd7eeb0.tar.gz
scala-0a1f923087267b2d9da100c6261e699f5bd7eeb0.tar.bz2
scala-0a1f923087267b2d9da100c6261e699f5bd7eeb0.zip
A couple minor .gitattributes additions.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 958b0b9f28..ac98781b3d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,16 @@
+# fallback on built-in heuristics
+# this must be first so later entries will override it
+* text=auto
+
# These files are text and should be normalized (convert crlf => lf)
*.c text
*.check text
*.css text
+*.flags text
*.html text
*.java text
*.js text
+*.policy text
*.sbt text
*.scala text
*.sh text