upgrade to 25.11

2025-12-02 17:03:31 -08:00
parent d28a6049ca
commit 03b50ccb9f
5 changed files with 3 additions and 9 deletions
--- a/home/default/git.nix
+++ b/home/default/git.nix
@@ -4,7 +4,7 @@
    enable = true;
    lfs.enable = true;

-    extraConfig = {
+    settings = {
      pull.ff = "only";

      merge.conflictstyle = "zdiff3";