Fix issues with .gitattributes

- Revert accidentally converted binary file
This commit is contained in:
David Foerster 2016-05-10 21:58:40 +02:00
parent fc37cc4a02
commit 1910751558
2 changed files with 25 additions and 24 deletions

49
.gitattributes vendored
View File

@ -1,29 +1,30 @@
# Set the default behavior, in case people don't have core.autocrlf set. # Set the default behavior, in case people don't have core.autocrlf set.
* text=auto eol=lf * text=auto
# Explicitly declare text files you want to always be normalized and converted # Explicitly declare text files that could be normalized and converted
# to native line endings on checkout. # to native line endings on checkout. However, as per the policy they're
*.[ch] text diff=cpp # supposed to have LF endings on all platforms.
*.[ch]pp text diff=cpp *.[ch] text diff=cpp eol=lf
*.asm text *.[ch]pp text diff=cpp eol=lf
Makefile text *.asm text eol=lf
*.make text Makefile text eol=lf
*.mk text *.make text eol=lf
*.inc text *.mk text eol=lf
*.md text *.inc text eol=lf
*.xml text *.md text eol=lf
*.xpm text -diff -merge *.xml text eol=lf
*.pem text -diff -merge *.xpm text -diff -merge eol=lf
*.cer text -diff -merge *.pem text -diff -merge eol=lf
*.manifest text *.cer text -diff -merge eol=lf
*.sh text *.manifest text eol=lf
*.txt text *.sh text eol=lf
*.html text diff=html *.txt text eol=lf
*.idl text *.html text diff=html eol=lf
*.fbp text *.idl text eol=lf
*.rgs text *.fbp text eol=lf
*.pkgproj text *.rgs text eol=lf
Sources text *.pkgproj text eol=lf
Sources text eol=lf
# Declare files that will always have LF line endings on checkout. # Declare files that will always have LF line endings on checkout.
*.desktop text eol=lf *.desktop text eol=lf

Binary file not shown.