diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-05 14:17:29 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-05 14:17:29 +0200 |
| commit | 4cbf89fa4408942ca38815e946f1e02ab913c3ad (patch) | |
| tree | b1fc98841d6c26171221e66a5d659b39d856bf65 /.gitattributes | |
| parent | c3906917675b54e9ac1f248c9fb0fba9fa310f0e (diff) | |
| parent | e6917ac758e782fa03b6912a3feb8f9f8d0950a9 (diff) | |
| download | scala-4cbf89fa4408942ca38815e946f1e02ab913c3ad.tar.gz scala-4cbf89fa4408942ca38815e946f1e02ab913c3ad.tar.bz2 scala-4cbf89fa4408942ca38815e946f1e02ab913c3ad.zip | |
Merge pull request #4784 from lrytz/merge-2.11-to-2.12-oct-5v2.12.0-M3
Merge 2.11 to 2.12 oct 5
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/.gitattributes b/.gitattributes index ac98781b3d..da4421cb78 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,20 +2,24 @@ # this must be first so later entries will override it * text=auto +# check out text files with lf, not crlf, on Windows. (especially +# important for Scala source files, since """ preserves line endings) +text eol=lf + # 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 -*.txt text -*.xml text +*.c eol=lf +*.check eol=lf +*.css eol=lf +*.flags eol=lf +*.html eol=lf +*.java eol=lf +*.js eol=lf +*.policy eol=lf +*.sbt eol=lf +*.scala eol=lf +*.sh eol=lf +*.txt eol=lf +*.xml eol=lf # Windows-specific files get windows endings *.bat eol=crlf |