Skip to content

Commit

Permalink
Update .gitattributes to prevent CRLF issues
Browse files Browse the repository at this point in the history
  • Loading branch information
DDuarte committed Jul 10, 2015
1 parent 57091cc commit 5b07878
Showing 1 changed file with 22 additions and 11 deletions.
33 changes: 22 additions & 11 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
# Lineendings
*.sln eol=crlf
*.vcproj eol=crlf
*.vcxproj* eol=crlf
# Auto detect text files and perform LF normalization
* text=auto


# Whitespace rules
# strict (no trailing, no tabs)
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol

# normal (no trailing)
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol

# special files which must ignore whitespace
*.patch whitespace=-trailing-space eol=lf
*.diff whitespace=-trailing-space eol=lf
*.patch whitespace=-trailing-space eol=lf
*.diff whitespace=-trailing-space eol=lf

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

# Ignore sql/* files
sql/* linguist-documentation
sql/* linguist-documentation

0 comments on commit 5b07878

Please sign in to comment.