diff --git a/.gitconfig b/.gitconfig
index d837ae2..1ec5bea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -57,6 +57,8 @@
 	abbreviateCommands = true
 [commit]
 	verbose = true
+[merge]
+	ff = only
 [mergetool]
 	keepBackup = false
 [color "diff"]