From 586b14a58945798f2ca1c38c6f3660b9384d36b5 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <charles.cabergs@colruytgroup.com>
Date: Wed, 27 Sep 2023 13:59:32 +0200
Subject: Add delta git config and bat as a man pager

---
 config/git/config.darwin | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'config/git')

diff --git a/config/git/config.darwin b/config/git/config.darwin
index 7d27b5b..dd3f5b0 100644
--- a/config/git/config.darwin
+++ b/config/git/config.darwin
@@ -7,11 +7,37 @@
 	rebase = false
 [merge]
 	tool = vimdiff
+    conflictstyle = diff3
 [commit]
 	gpgsign = false
 [init]
 	defaultBranch = master
 [core]
     editor = "VIMINIT='' nvim"
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only --syntax-theme gruvbox-dark
+[diff]
+    colorMoved = default
+[delta]
+    syntax-theme = gruvbox-dark
+    # side-by-side = true
+    navigate = true    # use n and N to move between diff sections
+    line-numbers = true
+
+
+# [http]
+# 	sslVerify = false
+[credential]
+	helper = store
+[filter "lfs"]
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+[gpg]
+	format = ssh
+[gpg "ssh"]
+	allowedSignersFile =
 
 # vim:ft=gitconfig
-- 
cgit