diff --git a/git/.config/git/config b/git/.config/git/config
index 7844997..ab336b1 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -18,6 +18,9 @@
 [push]
     default = nothing
 
+[pull]
+    ff = only
+
 [merge]
     tool = vimdiff