diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-04-05 14:03:35 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-04-05 14:03:35 +0200 |
commit | 48a77e61880aeb6f18162f2ab0a5b03386cf5010 (patch) | |
tree | 4d8a8a97e4143b037feca4ff02882ff66bb6318d /.gitattributes | |
parent | 464947e6323dc1e473532b641335e903a36c1d6c (diff) | |
download | mariadb-git-48a77e61880aeb6f18162f2ab0a5b03386cf5010.tar.gz |
Make this repository aligned with 10.0 one
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cdfedef671f..bb22871094a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,23 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.cc text +*.cpp text +*.h text +*.test text + +# Declare files that will always have LF line endings on checkout. +*.result text eol=lf +storage/connect/mysql-test/connect/std_data/*.txt text eol=lf +storage/connect/mysql-test/connect/std_data/*.dat text eol=lf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary + *.c diff=cpp *.h diff=cpp *.cc diff=cpp |