diff --git a/.gitconfig b/.gitconfig
index 8eeed6d..cb09f3a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,3 +13,5 @@
     path = .gitconfig.local
 [rerere]
 	enabled = true
+[pull]
+	ff = only