diff --git a/.gitattributes b/.gitattributes
index b83edcae09..5d425843f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1 @@
 debian/changelog merge=dpkg-mergechangelogs
-.git-annex/*.log merge=union
-.git-annex/*/*/*.log merge=union