From 29feb9223e354351d71b8b8d95fc96b433279b45 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Sun, 21 Sep 2025 11:55:46 -0400
Subject: [PATCH] fixed git config

i think i am reverting a false fix, idk
---
 home/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/git.nix b/home/git.nix
index 7c3504a..db30f9d 100644
--- 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;
     };