2025-10-02 08:59:48 -05:00
2 changed files with 2 additions and 2 deletions
--- a/home/git.nix
+++ b/home/git.nix
@@ -15,7 +15,7 @@
    extraConfig = {
      init.defaultBranch = "master";
      push.autoSetupRemote = true;
-      pull.merge = true;
+      pull.rebase = false;
      merge.tool = "nvimdiff";
      mergetool.keepBackup = false;
    };