diff options
author | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-05-08 17:09:45 +0300 |
---|---|---|
committer | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-05-08 17:09:45 +0300 |
commit | 6ef3c7d93edcf342c8be947b3b8f9d1cdcca9a8e (patch) | |
tree | 252ea6dfe71426e8a269cb52d7347125c98ccdf9 /.gitattributes | |
parent | 0014bdc7eef141dcd66930e853242b3be4960831 (diff) | |
download | mariadb-git-6ef3c7d93edcf342c8be947b3b8f9d1cdcca9a8e.tar.gz |
Updated .gitattributes
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cdfedef671f..2e238207619 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,24 @@ +# 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 +*.ic text +*.cc text +*.cpp text +*.h text +*.test text + +# These files should be checked out as is +*.result -text -whitespace +storage/connect/mysql-test/connect/std_data/*.txt -text +storage/connect/mysql-test/connect/std_data/*.dat -text + +# 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 |