From 115ac49aa95caa4e648629f55ae287263a48655c Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 16 Jan 2026 20:03:07 +0100 Subject: updates from work --- .config/git/config##template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to '.config/git') diff --git a/.config/git/config##template b/.config/git/config##template index 0a3418a..3c996ba 100644 --- a/.config/git/config##template +++ b/.config/git/config##template @@ -37,7 +37,13 @@ ec = !git conflict -z | xargs -0 -- $EDITOR ours = !git conflict -z | xargs -0 -- git checkout --ours theirs = !git conflict -z | xargs -0 -- git checkout --theirs + nuke = !git reset --hard && git clean -fxd [pager] - log = diff-highlight | less - show = diff-highlight | less - diff = diff-highlight | less + log = delta + show = delta + diff = delta + blame = delta +[delta] + tabs = 2 + side-by-side = false + syntax-theme = base16 -- cgit v1.2.3