Skip to content

Commit

Permalink
Fix windows line endings.
Browse files Browse the repository at this point in the history
  • Loading branch information
julianhyde committed Mar 2, 2014
1 parent 99d5a0a commit 374266a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
23 changes: 23 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Auto detect text files and perform LF normalization
* text=auto

*.cs text diff=csharp
*.java text diff=java
*.html text diff=html
*.py text diff=python
*.pl text diff=perl
*.pm text diff=perl
*.css text
*.js text
*.sql text
*.q text

*.sh text eol=lf

#test files, use lf so that size is same on windows as well
data/files/*.dat text eol=lf

*.bat text eol=crlf
*.cmd text eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf
4 changes: 3 additions & 1 deletion src/main/config/checkstyle/checker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
<!-- Miscellaneous other checks (checker). -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<!-- Require files to end with newline characters -->
<module name="NewlineAtEndOfFile"/>
<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>

<!-- Checks for whitespace (tree walker) -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
Expand Down

0 comments on commit 374266a

Please sign in to comment.