diff --git a/home-manager/git.nix b/home-manager/git.nix
index 32b1414..7474d88 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -23,6 +23,7 @@
 
         log.date = "relative";
 
+        merge.ff = false;
         merge.tool = "nvim";
 
         mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";