From 31bceef0614e0d4dd8605058578d64993a3dfe2b Mon Sep 17 00:00:00 2001
From: Alec Lomas <alec@lowmess.com>
Date: Sun, 23 Mar 2025 17:54:48 -0700
Subject: [PATCH] :wrench: update git config

---
 git/.gitconfig | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 3623427..314014e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,14 +11,47 @@
 [init]
   defaultBranch = main
 
+[commit]
+  gpgsign = true
+  verbose = true
+
+[diff]
+  algorithm = histogram
+  colorMoved = plain
+  mnemonicPrefix = true
+  renames = true
+
+[merge]
+  conflictstyle = zdiff3
+
+[rerere]
+  enabled = true
+  autoupdate = true
+
 [push]
   default = simple
+  autoSetupRemote = true
+  followTags = true
 
 [pull]
   rebase = true
 
-[commit]
-  gpgsign = true
+[fetch]
+  prune = true
+  pruneTags = true
+  all = true
+
+[branch]
+  sort = -committerdate
+
+[tag]
+  sort = version:refname
+
+[column]
+  ui = auto
+
+[help]
+  autocorrect = prompt
 
 [alias]
   eat = stash
-- 
2.51.2