diff --git a/roles/home-cli/files/gitconfig b/roles/home-cli/files/gitconfig
index 4dd5ff9..366c8d9 100644
--- a/roles/home-cli/files/gitconfig
+++ b/roles/home-cli/files/gitconfig
@@ -4,6 +4,8 @@
 [pull]
 	ff = only
 	rebase = false
+[merge]
+	ff = only
 [push]
 	default = simple
 [color]