From 5a2f357efb76b7adfcb361c560ae6706f225bbcc Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Sun, 30 Nov 2025 13:20:01 -0700
Subject: rebase better than merge

---
 home-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'home-manager/default.nix')

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 48e42d6..d528cfc 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -134,7 +134,7 @@
             pruneTags = true;
             all = true;
           };
-          pull = {rebase = false;};
+          pull = {rebase = true;};
           merge = { conflictstyle = "zdiff3"; };
           help = { autocorret = "prompt"; };
           commit = { verbose = true; };
-- 
cgit v1.2.3