From bfec11bb29ab2771d533dc2bc98ddb47b630fdba Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 25 Oct 2023 21:18:56 +0200
Subject: [PATCH] git: Only allow fast-forward merge by default

---
 users/simon/modules/git.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/users/simon/modules/git.nix b/users/simon/modules/git.nix
index 231ac16..7c9dead 100644
--- a/users/simon/modules/git.nix
+++ b/users/simon/modules/git.nix
@@ -18,6 +18,9 @@
         # LTeX: enabled=false'');
       core.quotepath = "off";
       pull.ff = "only";
+      merge = {
+        ff = "only";
+      };
       diff = {
         age = {
           # This uses the de facto default key location with no ability to