summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorVicentiu Ciorbaru <vicentiu@mariadb.org>2015-05-08 17:27:41 +0300
committerVicentiu Ciorbaru <vicentiu@mariadb.org>2015-05-08 17:27:41 +0300
commit5ae8d06df498037cff864c28076b42c02577e382 (patch)
tree7e892dc5fea0ef1f3a91f69a65206e5859b7b538 /.gitattributes
parent91ee98a8c88d2595d903e70cd4e1824dffb9e43c (diff)
downloadmariadb-git-5ae8d06df498037cff864c28076b42c02577e382.tar.gz
Update .gitattributes
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes21
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