Switch back to git pull.rebase = false by default

2023-12-19 14:46:38 +00:00 · 2023-12-19 14:46:38 +00:00 · 6939b7f468
parent acbfe003cc
commit 6939b7f468
1 changed files with 1 additions and 1 deletions
--- a/home/default.nix
+++ b/home/default.nix
@ -126,7 +126,7 @@
      };
      extraConfig = {
        github.user = "elitherl";
-        pull.rebase = true;
+        pull.rebase = false;
        init.defaultBranch = "main";
        merge.conflictstyle = "diff3";
        diff.colorMoved = "default";