summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-15 19:44:37 -0700
committerPaul Phillips <paulp@improving.org>2012-09-20 09:57:00 -0700
commite4e8578c5cf433648fa5428bfb2ad2ce8d347439 (patch)
tree2a5a1ab8b15c55a72f072846e44a7cefc145a3a6 /.gitattributes
parent3136e53e0ce4d73e1d2b3e8d043fff7892b2f439 (diff)
downloadscala-e4e8578c5cf433648fa5428bfb2ad2ce8d347439.tar.gz
scala-e4e8578c5cf433648fa5428bfb2ad2ce8d347439.tar.bz2
scala-e4e8578c5cf433648fa5428bfb2ad2ce8d347439.zip
New .gitattributes file.
This should assist in keeping line endings straight. It is designed to enforce LF endings everywhere except for files specifically for windows.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes26
1 files changed, 26 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..958b0b9f28
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,26 @@
+# These files are text and should be normalized (convert crlf => lf)
+*.c text
+*.check text
+*.css text
+*.html text
+*.java text
+*.js text
+*.sbt text
+*.scala text
+*.sh text
+*.txt text
+*.xml text
+
+# Windows-specific files get windows endings
+*.bat eol=crlf
+*.cmd eol=crlf
+*-windows.tmpl eol=crlf
+
+# Some binary file types for completeness
+# (binary is a macro for -text -diff)
+*.dll binary
+*.gif binary
+*.jpg binary
+*.png binary
+*.class -text diff=class
+*.jar -text diff=jar