Skip to content

Commit d6fb501

Browse files
committed
Update .gitattributes to prevent CRLF issues
1 parent b06a8e5 commit d6fb501

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

.gitattributes

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1-
# Lineendings
2-
*.sln eol=crlf
3-
*.vcproj eol=crlf
4-
*.vcxproj* eol=crlf
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
54

65
# Whitespace rules
76
# strict (no trailing, no tabs)
8-
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
9-
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
7+
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
8+
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
109

1110
# normal (no trailing)
12-
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
13-
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol
11+
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
12+
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol
1413

1514
# special files which must ignore whitespace
16-
*.patch whitespace=-trailing-space eol=lf
17-
*.diff whitespace=-trailing-space eol=lf
15+
*.patch whitespace=-trailing-space eol=lf
16+
*.diff whitespace=-trailing-space eol=lf
17+
18+
# Standard to msysgit
19+
*.doc diff=astextplain
20+
*.DOC diff=astextplain
21+
*.docx diff=astextplain
22+
*.DOCX diff=astextplain
23+
*.dot diff=astextplain
24+
*.DOT diff=astextplain
25+
*.pdf diff=astextplain
26+
*.PDF diff=astextplain
27+
*.rtf diff=astextplain
28+
*.RTF diff=astextplain
1829

1930
# Ignore sql/* files
20-
sql/* linguist-documentation
31+
sql/* linguist-documentation

0 commit comments

Comments
 (0)