git: Only allow fast-forward merge by default

2023-10-25 21:18:56 +02:00 · 2023-10-25 21:18:56 +02:00 · bfec11bb29
parent 45d4a30aac
commit bfec11bb29
1 changed files with 3 additions and 0 deletions
--- 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