diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index 86d12e3f..676d7a1f 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -54,3 +54,5 @@
 	program = gpgv2
 [tag]
 	forceSignAnnotated = true
+[pull]
+	ff = only
diff --git a/conf/gitconfig b/conf/gitconfig
index 88219e77..7b5fb50b 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -49,8 +49,10 @@
 [interactive]
 #    diffFilter = diff-highlight
 [gpg]
-       program = gpg2
+	program = gpg2
 [gpgv]
-       program = gpgv2
+	program = gpgv2
 [tag]
-       forceSignAnnotated = true
+	forceSignAnnotated = true
+[pull]
+	ff = only