diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-05-08 11:56:48 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-08 11:56:48 +0200 |
commit | c1b07ff9b71434d22dab120dcd01b174ba162195 (patch) | |
tree | a39aadb8b059f6f70d033e4fedbb26a2e427e2ee | |
parent | b5c5f3176a73258a43fd0a8d459f46dd03037c11 (diff) | |
download | mariadb-git-c1b07ff9b71434d22dab120dcd01b174ba162195.tar.gz |
update .gitattributes
-rw-r--r-- | .gitattributes | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index bb22871094a..2e238207619 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,15 +4,16 @@ # 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 -# 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 +# 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 |