diff --git a/git/config b/git/config
index cd745f1..9cffbd0 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,8 @@
 [pull]
 	rebase = true
 	prune = true
+[merge]
+	ff = only
 [rebase]
 	autoStash = true
 [log]