feat(symlinks): add delta as git diff

trystan2k · Sep 10, 2024 · 3622f15 · 3622f15
1 parent 6af73db
commit 3622f15
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/symlinks/.gitconfig b/symlinks/.gitconfig
@@ -5,10 +5,23 @@
 
 [core]
 	excludesfile = ~/.gitignore
+	pager = delta
 
 [commit]
 	template = ~/.gitmessage
 
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true    # use n and N to move between diff sections
+		side-by-side = true
+		line-numbers = true
+		hyperlinks = true
+
+[merge]
+    conflictstyle = diff3
+
 [alias]
 
 	st = status

diff --git a/tools/macos/Brewfile b/tools/macos/Brewfile
@@ -11,6 +11,7 @@ brew "asdf"
 brew "autojump"
 brew "bat"
 brew "curl"
+brew "delta"
 brew "detox"
 brew "dust"
 brew "eza"