fixed git config

i think i am reverting a false fix, idk
2025-09-21 11:55:46 -04:00
parent 7bc7749f51
commit 29feb9223e
1 changed files with 1 additions and 1 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;
    };