From 157ce51fb80574e38723d0b7a144fc6908f8a433 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <qsx@chaotikum.eu>
Date: Mon, 27 Jul 2026 19:22:34 +0200
Subject: Git: Use `git-delta` (somewhat) optionally

---
 dot.gitconfig       |  3 +++
 dot.gitconfig.delta | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 dot.gitconfig.delta

diff --git a/dot.gitconfig b/dot.gitconfig
index 115e630..29a452c 100644
--- a/dot.gitconfig
+++ b/dot.gitconfig
@@ -1,5 +1,6 @@
 [include]
 	path = ~/.dotfiles/grml-etc-core/etc/skel/.gitconfig
+	path = .gitconfig.delta
 [user]
 	email = qsx@chaotikum.eu
 	name = Thomas Schneider
@@ -23,3 +24,5 @@
 	bcc = fcc-sent@qsuscs.de
 [init]
 	defaultBranch = main
+[merge]
+	conflictStyle = diff3
diff --git a/dot.gitconfig.delta b/dot.gitconfig.delta
new file mode 100644
index 0000000..c27f472
--- /dev/null
+++ b/dot.gitconfig.delta
@@ -0,0 +1,12 @@
+[core]
+    pager = delta
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true    # use n and N to move between diff sections
+
+    # delta detects terminal colors automatically; set one of these to disable auto-detection
+    # dark = true
+    # light = true
-- 
cgit v1.2.3