diff --git a/.gitconfig b/.gitconfig
index 091fc79..4b839db 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -25,3 +25,5 @@
     ui = true
 [branch]
     autosetuprebase = always
+[merge]
+	ff = false