From a901458799ec9e41594d998747eb2ce566a56b84 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 10 Nov 2022 09:06:52 +0100
Subject: [PATCH] feat(git): disable fast-forward merging by default

---
 home-manager/git.nix | 1 +
 1 file changed, 1 insertion(+)

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\"";