diff options
| author | David Foerster <david.foerster@informatik.hu-berlin.de> | 2016-05-10 21:58:40 +0200 |
|---|---|---|
| committer | David Foerster <david.foerster@informatik.hu-berlin.de> | 2016-05-10 21:58:40 +0200 |
| commit | 191075155835172e5596e191cf0679ff9022f0fd (patch) | |
| tree | 7e19dee17afbead92684d59d427a1c3c281cd3e6 /.gitattributes | |
| parent | fc37cc4a02ed13d1a73b941a9f80975600fd1b99 (diff) | |
| download | VeraCrypt-191075155835172e5596e191cf0679ff9022f0fd.tar.gz VeraCrypt-191075155835172e5596e191cf0679ff9022f0fd.zip | |
Fix issues with .gitattributes
- Revert accidentally converted binary file
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/.gitattributes b/.gitattributes index e036c946..d8280400 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,29 +1,30 @@ # 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 -# to native line endings on checkout. -*.[ch] text diff=cpp -*.[ch]pp text diff=cpp -*.asm text -Makefile text -*.make text -*.mk text -*.inc text -*.md text -*.xml text -*.xpm text -diff -merge -*.pem text -diff -merge -*.cer text -diff -merge -*.manifest text -*.sh text -*.txt text -*.html text diff=html -*.idl text -*.fbp text -*.rgs text -*.pkgproj text -Sources text +# Explicitly declare text files that could be normalized and converted +# to native line endings on checkout. However, as per the policy they're +# supposed to have LF endings on all platforms. +*.[ch] text diff=cpp eol=lf +*.[ch]pp text diff=cpp eol=lf +*.asm text eol=lf +Makefile text eol=lf +*.make text eol=lf +*.mk text eol=lf +*.inc text eol=lf +*.md text eol=lf +*.xml text eol=lf +*.xpm text -diff -merge eol=lf +*.pem text -diff -merge eol=lf +*.cer text -diff -merge eol=lf +*.manifest text eol=lf +*.sh text eol=lf +*.txt text eol=lf +*.html text diff=html eol=lf +*.idl text eol=lf +*.fbp text eol=lf +*.rgs text eol=lf +*.pkgproj text eol=lf +Sources text eol=lf # Declare files that will always have LF line endings on checkout. *.desktop text eol=lf |