7f8312960a570702c461e6dc4ec23d03fbf0a2cb

Author
TheEdgeOfRage <git@theedgeofrage.com>
Committer
TheEdgeOfRage <git@theedgeofrage.com>
Date

Message

Use delta for git diffs

Diff

 1diff --git a/dot_gitconfig b/dot_gitconfig
 2index 4a46852d8df7e9d765767fc02cd6e799e6b4bd09..e4107c46fd460f9e2621e994dfb0da24a18838f8 100644
 3--- a/dot_gitconfig
 4+++ b/dot_gitconfig
 5@@ -5,8 +5,6 @@
 6 [alias]
 7 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 8 	slg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s' --abbrev-commit
 9-[diff]
10-	tool = nvim -d
11 [difftool]
12 	prompt = false
13 [commit]
14@@ -19,3 +17,13 @@
15 	defaultBranch = main
16 [color]
17 	ui = auto
18+[core]
19+    pager = delta
20+[interactive]
21+    diffFilter = delta --color-only
22+[delta]
23+    navigate = true
24+[merge]
25+    conflictstyle = diff3
26+[diff]
27+    colorMoved = default