diff --git a/dot_gitconfig b/dot_gitconfig
index ec930d9..b0eddcb 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -13,6 +13,7 @@
 	autoSetupRemote = true
 [pull]
 	rebase = false
+    ff = only
 [delta]
 	navigate = true  # use n and N to move between diff sections
 	side-by-side = true