From bb1870cf4c48519e736f9e3f4aecb6ac4c68037e Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Fri, 17 Apr 2026 10:53:36 +0100
Subject: feat: add modern git options

- rebase.updateRefs = true: auto-update dependent branches when
  rebasing a stack. Essential for stacked branch workflows.
- rerere.enabled = true: remember conflict resolutions and auto-apply
  them when the same conflict is encountered again.
- column.ui = auto: display branches and tags in columns instead of
  a long vertical list.
---
 home/.config/git/config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/.config/git/config b/home/.config/git/config
index 2b91f0d..226e8a0 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -30,9 +30,12 @@
 [rebase]
     autoStash = true
     autoSquash = true
+    updateRefs = true
 [fetch]
     recurseSubmodules = on-demand
     prune = true
+[rerere]
+    enabled = true
 [pull]
     ff = only
 [merge]
@@ -66,6 +69,8 @@
 [advice]
     detachedHead = false
     skippedCherryPicks = false
+[column]
+    ui = auto
 [format]
     pretty = oneline
 [delta]
-- 
cgit v1.2.3-70-g09d2