From f9f883c395d995bb8840e0c7ed34718570683e86 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Tue, 11 Mar 2025 15:42:41 -0700
Subject: [PATCH] beatific: more git config

---
 modules/beatific.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/beatific.nix b/modules/beatific.nix
index 0bf5df3..b723b13 100644
--- a/modules/beatific.nix
+++ b/modules/beatific.nix
@@ -141,8 +141,26 @@ in {
         git = {
           enable = true;
           config = {
+            column.ui = "auto";
             init.defaultBranch = "master";
-            merge.conflictstyle = "diff3";
+            merge.conflictstyle = "zdiff3";
+            branch.sort = "-committerdate";
+            diff = {
+              algorithm = "histogram";
+              colorMoved = "plain";
+              mnemonicPrefix = true;
+              renames = true;
+            };
+            help.autocorrect = "prompt";
+            commit.verbose = true;
+            rerere = {
+              enabled = true;
+              autoupdate = true;
+            };
+            rebase = {
+              autoSquash = true;
+              autoStash = true;
+            };
             alias = {
               amend = "commit --amend";
               fixup = "commit --amend --no-edit";