From fa2ae3b86e2d9eb7f20f83abd8f394e4df348ef8 Mon Sep 17 00:00:00 2001
From: 0xWheatyz <wyatt@leeworks.dev>
Date: Sat, 28 Mar 2026 11:57:03 -0400
Subject: [PATCH] chore(git): set pull strategy to merge by default

---
 home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home.nix b/home.nix
index a2fb6f4..153a673 100644
--- a/home.nix
+++ b/home.nix
@@ -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";