try using delta

2024-11-13 11:19:24 -05:00
parent b8f053d270
commit 9484efa16d
1 changed files with 30 additions and 24 deletions
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -1,3 +1,7 @@
+[core]
+  autocrlf = input
+  safecrlf = true
+  pager = delta
 [user]
  email = joel@beckmeyer.us
  name = Joel Beckmeyer
@@ -11,6 +15,7 @@
  minRacyThreshold = 6379 microseconds
 [merge]
  tool = meld
+  conflictstyle = zdiff3
 [review "review.lineageos.org"]
  username = jbeckmeyer
 [filter "lfs"]
@@ -20,6 +25,7 @@
  required = true
 [pull]
  rebase = false
-[core]
-	autocrlf = input
-	safecrlf = true
+[interactive]
+  diffFilter = delta --color-only
+[delta]
+  navigate = true  # use n and N to move between diff sections