diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig
index 494f2d4..7195480 100644
--- a/etc/soft/git/gitconfig
+++ b/etc/soft/git/gitconfig
@@ -17,6 +17,9 @@
 [color]
 	ui = true
 
+[pull]
+	ff = only
+
 [merge]
 	tool = vimdiff