- commit
- e99f8d3
- parent
- a6f6f0d
- author
- Eric Bower
- date
- 2026-03-28 23:27:06 -0400 EDT
refactor: replace delta with difftastic
2 files changed,
+4,
-16
+3,
-8
1@@ -11,14 +11,6 @@
2 renames = true
3 [format]
4 useAutoBase = whenAble
5-[core]
6- pager = delta
7-[interactive]
8- diffFilter = delta --color-only
9-[delta]
10- navigate = true # use n and N to move between diff sections
11- # side-by-side = true
12- dark = true
13 [merge]
14 conflictStyle = zdiff3
15 [alias]
16@@ -30,3 +22,6 @@
17 t = log --graph --oneline --all
18 mo = merge origin/main
19 ro = rebase -i origin/main
20+ dl = -c diff.external=difft log -p --ext-diff
21+ ds = -c diff.external=difft show --ext-diff
22+ dft = -c diff.external=difft diff
+1,
-8
1@@ -4,20 +4,13 @@
2 name = "Eric Bower"
3 email = "me@erock.io"
4
5-[diff]
6-tool = "delta"
7-
8 [ui]
9-diff-formatter = ":git" # required by `delta`
10-pager=["delta", "--pager", "less -FRX"] # Keeps output from the terminal after closing the pager
11+diff-formatter = ["difft", "--color=always", "$left", "$right"]
12 default-command = "log"
13
14 # These options allow for `jj diff` and `jj show` to clear the output from the terminal after closing the pager.
15 [[--scope]]
16 --when.commands = ["diff", "show"]
17
18-[--scope.ui]
19-pager = "delta"
20-
21 [aliases]
22 tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"]