jj: Update delta diff settings

Remove deprecated 'ui.diff.format' setting and replace with
'ui.diff-formatter'.

Use the time to also ONLY set up delta as the diff and show command
pager using scopes (since I was perusing the jj discussions anyway).

This has the advantage that normal jj paging is done with `-FRX` as far
as I understand -- which means after we close out of the pager the
content remains on screen (-X). This is not the case with delta. So now,
the contents of e.g. the last log command should always stay on screen.
This commit is contained in:
Marty Oehme 2025-06-12 21:39:56 +02:00
parent 03f85fd958
commit 53b8bd0175
Signed by: Marty
GPG key ID: 4E535BC19C61886E

View file

@ -13,10 +13,14 @@ private-commits = "description(glob-i:'WIP:*') | description(glob-i:'PRIVATE:*')
[ui]
default-command = "log"
diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
pager = "delta"
[ui.diff]
format = "git" # for the time being to use delta well
# use delta as formatter but _only_ for diff and show
# see: https://github.com/jj-vcs/jj/discussions/4690#discussioncomment-12388965
[[--scope]]
--when.commands = ["diff", "show"]
[--scope.ui]
pager = "delta"
diff-formatter = ":git"
[aliases]
# see: https://shaddy.dev/notes/jj-tug/, update most recent bookmark