diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..b98b07d7d2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.git-annex/*.log merge=union