From 92b6e48f364328befe194966398224428e028b38 Mon Sep 17 00:00:00 2001 From: Charles Danesi Date: Sat, 2 Nov 2024 21:29:19 -0400 Subject: [PATCH] change git diff to use delta --- .config/git/config | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.config/git/config b/.config/git/config index 5845a04..c2aaf14 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,5 +1,23 @@ [user] - email = charles@charlesdanesi.net - name = Charles D + email = charles@charlesdanesi.net + name = Charles Danesi + [init] - defaultBranch = main + defaultBranch = main + +[core] + editor = nvim + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true + side-by-side = true + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default