From 062300c001fcdf2788e1582471d83cda1629d532 Mon Sep 17 00:00:00 2001
From: jolheiser <john.olheiser@gmail.com>
Date: Sat, 17 Feb 2024 16:29:14 -0600
Subject: [PATCH] chore: update git config

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 apps/nogui/git.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index b93beda..5361e3c 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -29,10 +29,10 @@ in {
       tui = "!lazygit";
     };
     lfs.enable = true;
-    ignores = [".idea/" "result"];
+    ignores = [".idea/" "result" "node_modules" "ve"];
     extraConfig = {
       init.defaultBranch = "main";
-      merge.conflictstyle = "diff3";
+      merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
       core.editor = "hx";
       push = {
@@ -40,7 +40,10 @@ in {
         default = "current";
         gpgSign = "if-asked";
       };
+      rerere.enabled = true;
       pull.rebase = true;
+      diff.algorithm = "histogram";
+      merge.tool = "hx";
       url =
         {
           "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";