From 801868e3371f030d4265df93924e9d3ca90c4caf Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 12 Sep 2024 16:16:38 +0100
Subject: nicer git diffs & rebases

---
 .gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 5948f58..2dce91a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -39,13 +39,14 @@
         renames = copies
         colorMoved = zebra
 [merge]
-        conflictstyle = diff3
+        conflictstyle = zdiff3
 [log]
         decorate = short
         date = iso
 [rebase]
         stat = true
         autosquash = true
+        updateRefs = true
 [rerere]
         enabled = true
 [transfer]
-- 
cgit v1.2.3