fix(comfy/git): use merge.ff = "only"

isabelroses · Dec 2, 2024 · dec0af2 · dec0af2
1 parent 401acf1
commit dec0af2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/home/comfy/packages/misc/git/git.nix b/home/comfy/packages/misc/git/git.nix
@@ -27,6 +27,8 @@ in
         autoSquash = true;
         autoStash = true;
       };
+      merge.ff = "only";
+
       commit.gpgsign = true;
       gpg.format = "ssh";
       user.signingkey = osConfig.age.secrets.keys-comfy-gh.path;