summaryrefslogtreecommitdiffstats
path: root/libmariadb/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to 'libmariadb/.gitattributes')
-rw-r--r--libmariadb/.gitattributes9
1 files changed, 9 insertions, 0 deletions
diff --git a/libmariadb/.gitattributes b/libmariadb/.gitattributes
new file mode 100644
index 00000000..09f80895
--- /dev/null
+++ b/libmariadb/.gitattributes
@@ -0,0 +1,9 @@
+# Normalise line endings:
+* text=auto
+
+# Prevent certain files from being exported:
+.gitattributes export-ignore
+.gitignore export-ignore
+
+# merge
+.travis.yml merge=cc