Skip to content

Commit 26b3db3

Browse files
Attempt better line endings fix
1 parent cde2ffd commit 26b3db3

2 files changed

Lines changed: 140 additions & 142 deletions

File tree

.gitattributes

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,51 @@
1-
# .gitattributes snippet to force users to use same line endings for project.
2-
#
3-
# Handle line endings automatically for files detected as text
4-
# and leave all files detected as binary untouched.
5-
* text eol=lf
1+
# Handle line endings automatically for files detected as text
2+
# and leave all files detected as binary untouched.
3+
* text eol=lf
64

7-
#
8-
# The above will handle all files NOT found below
9-
# https://help.github.com/articles/dealing-with-line-endings/
10-
# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
5+
# The above will handle all files NOT found below
6+
# https://help.github.com/articles/dealing-with-line-endings/
7+
# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
118

9+
# These files are text and should be normalized (Convert crlf => lf)
10+
*.php text
11+
*.css text
12+
*.js text
13+
*.json text
14+
*.htm text
15+
*.html text
16+
*.xml text
17+
*.txt text
18+
*.ini text
19+
*.inc text
20+
*.pl text
21+
*.rb text
22+
*.py text
23+
*.scm text
24+
*.sql text
25+
*.htaccess text
26+
*.sh text
27+
*.java text
1228

29+
# These files are Windows-specific and should retain crlf
30+
*.bat text eol=crlf
1331

14-
# These files are text and should be normalized (Convert crlf => lf)
15-
*.php text
16-
*.css text
17-
*.js text
18-
*.json text
19-
*.htm text
20-
*.html text
21-
*.xml text
22-
*.txt text
23-
*.ini text
24-
*.inc text
25-
*.pl text
26-
*.rb text
27-
*.py text
28-
*.scm text
29-
*.sql text
30-
.htaccess text
31-
*.sh text
32-
*.java text
33-
34-
# These files are binary and should be left untouched
35-
# (binary is a macro for -text -diff)
36-
*.png binary
37-
*.jpg binary
38-
*.jpeg binary
39-
*.gif binary
40-
*.ico binary
41-
*.mov binary
42-
*.mp4 binary
43-
*.mp3 binary
44-
*.flv binary
45-
*.fla binary
46-
*.swf binary
47-
*.gz binary
48-
*.zip binary
49-
*.7z binary
50-
*.ttf binary
51-
*.pyc binary
52-
*.jar binary
53-
*.class binary
32+
# These files are binary and should be left untouched
33+
# (binary is a macro for -text -diff)
34+
*.png binary
35+
*.jpg binary
36+
*.jpeg binary
37+
*.gif binary
38+
*.ico binary
39+
*.mov binary
40+
*.mp4 binary
41+
*.mp3 binary
42+
*.flv binary
43+
*.fla binary
44+
*.swf binary
45+
*.gz binary
46+
*.zip binary
47+
*.7z binary
48+
*.ttf binary
49+
*.pyc binary
50+
*.jar binary
51+
*.class binary

gradlew.bat

Lines changed: 93 additions & 93 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)