Use delta for git diffs

oalders · Nov 13, 2023 · aee474d · aee474d
1 parent b9c9ad3
commit aee474d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/configure/git.sh b/configure/git.sh
@@ -14,7 +14,6 @@ git config --global diff.algorithm histogram
 git config --global github.user oalders
 git config --global help.autocorrect 10
 git config --global init.defaultBranch main
-git config --global merge.conflictstyle diff3
 git config --global push.default current
 git config --global rebase.autosquash true
 git config --global rebase.instructionFormat "(%an <%ae>) %s"
@@ -65,7 +64,14 @@ git config --global alias.view-stash 'stash show -p stash@{0}'
 
 git config --global color.ui auto
 git config --global core.excludesfile ~/.gitignore_global
-git config --global core.pager 'less'
+
+# configure delta as git's pager
+git config --global core.pager 'delta'
+git config --global delta.light false
+git config --global delta.navigate true
+git config --global diff.colorMoved default
+git config --global interactive.diffFilter 'delta --color-only'
+git config --global merge.conflictStyle diff3
 
 # takes a commit name as sole arg
 git config --global alias.whatis "show -s --pretty='tformat:%h (%s, %ad)' --date=short"

diff --git a/installer/ubi.sh b/installer/ubi.sh
@@ -48,6 +48,7 @@ ubi --project cli/cli --in "$in" --exe gh
 ubi --project jqlang/jq --in "$in"
 ubi --project dandavison/delta --in "$in"
 ubi --project crate-ci/typos --in "$in"
+ubi --project dandavison/delta --in "$in"
 # ubi --project Wilfred/difftastic --exe difft --in "$in"
 
 exit