summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-03-16 17:37:00 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-03-16 17:37:00 +0100
commit57aaccef52c22760450f02618213ec90ba0e873e (patch)
tree21b20440b6a8afc20516eee6d41d2ff851db91bc /.gitattributes
parenteb2f7638728b233b7e1976b69a372cc7fb3d2862 (diff)
downloadmariadb-git-57aaccef52c22760450f02618213ec90ba0e873e.tar.gz
- Adding files to ignore from C C++ and Visual Studio
- Making result files to be ended by LF to avoid test failures
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes20
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