From ee66538df07a9cd41701d528b95836efe935744d Mon Sep 17 00:00:00 2001
From: Noah Pederson <noah@packetlost.dev>
Date: Sat, 01 Mar 2025 17:49:21 +0000
Subject: [PATCH] ADD: git config stuff

---
 noah-home.nix | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file(s) changed, 40 insertion(s)(+), 0 deletion(s)(-)

diff --git a/noah-home.nix b/noah-home.nix
--- a/noah-home.nix
+++ b/noah-home.nix
@@ -193,13 +193,53 @@
         rebase = true;
       };
       push = {
+        default = "simple";
         autoSetupRemote = true;
+        followTags = true;
       };
       credential = {
         helper = "cache";
       };
       alias = {
         out = "log @{u}..";
+      };
+      column = {
+        ui = "auto";
+      };
+      branch = {
+        sort = "-committerdate";
+      };
+      tag = {
+        sort = "version:refname";
+      };
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = true;
+        renames =  true;
+      };
+      fetch = {
+        prune = true;
+        pruneTags = true;
+        all = true;
+      };
+      help = {
+        autocorrect = "prompt";
+      };
+      commit = {
+        verbose = true;
+      };
+      rerere = {
+        enabled = true;
+        autoupdate = true;
+      };
+      rebase = {
+        autoSquash = true;
+        autoStash = true;
+        updateRefs = true;
+      };
+      merge = {
+        conflictStyle = "zdiff3";
       };
     };
     ignores = [

--
tangled.sh