diff --git a/config/git/config b/config/git/config
index 65fa801..faff1ec 100644
--- a/config/git/config
+++ b/config/git/config
@@ -10,5 +10,7 @@
   path = ~/.config/git/config-work
 [merge]
 	autoStash = true
+	edit = no
+	ff = no
 [rebase]
 	autoStash = true