From 25b2150f0ac00d31f4f4228ed1efff6bf084dcf3 Mon Sep 17 00:00:00 2001
From: Anton Bobov <anton@bobov.name>
Date: Thu, 14 Sep 2023 23:14:53 +0500
Subject: [git] Update config

---
 files/.gitconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'files/.gitconfig')

diff --git a/files/.gitconfig b/files/.gitconfig
index 277fc43..3b3ca6a 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -19,7 +19,9 @@
   new = green bold
   whitespace = red reverse
 [diff]
+  algorithm = histogram
   tool = vimdiff
+  colorMoved = true
 [difftool]
   prompt = false
 [diff-so-fancy]
@@ -28,7 +30,7 @@
 [grep]
   lineNumber = true
 [merge]
-  conflictstyle = diff3
+  conflictstyle = zdiff3
   stat = true
   tool = vimdiff
 [core]
@@ -98,7 +100,9 @@
 [rebase]
   instructionFormat = %s [%an] {%ar}
   autoStash = true
+  updateRefs = true
 [rerere]
+  autoUpdate = true
   enabled = true
 [status]
   submoduleSummary = true
-- 
cgit v1.2.3