diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
| commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
| tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /.gitattributes | |
| parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
| parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
| download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip | |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..d8280400 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,50 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# 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 + +# Declare files that will always have CRLF line endings on checkout. +*.sln text eol=crlf +*.vcproj text eol=crlf +*.rc text eol=crlf +*.bat text eol=crlf +*.cmd text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary +*.pdf binary +*.bmp binary +*.ico binary +*.od[fgpst] binary +*.hc binary +*.icns binary +*.rtf binary +*.bz2 binary +*.pfx binary |