From cc7e26cecc5bd689a4fdfb49530b470ea67d3906 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Sat, 15 Feb 2025 13:08:53 -0500
Subject: [PATCH] add merge tool, change pull algo

---
 home/git.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/home/git.nix b/home/git.nix
index fdaaebc..3f70aaa 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -15,7 +15,8 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.rebase = true;
+      pull.merge = true;
+      merge.tool = "nvimdiff";
     };
 
     ignores = [
@@ -39,7 +40,7 @@
       dc = "diff --cached";
       amend = "commit --amend -m";
 
-      # aliases for submodule
+      # aliases for submodules
       update = "submodule update --init --recursive";
       foreach = "submodule foreach";
     };