chore(git): set pull strategy to merge by default

2026-03-28 11:57:03 -04:00
parent 91faab704c
commit fa2ae3b86e
1 changed files with 1 additions and 0 deletions
@@ -124,6 +124,7 @@
        name = "0xWheatyz";
        email = "wyatt@leeworks.dev";
      };
+      pull.rebase = "false";
      init.defaultBranch = "master";
      push.autoSetupRemote = "true";
      alias.lg = "log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit";