From a3d1ac98e288b1699935681cc35298c0ee4a7f90 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Sat, 24 Jun 2023 14:15:06 +0200 Subject: [PATCH] jj: use scm-diff-editor from git-branchless --- .jjconfig.toml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.jjconfig.toml b/.jjconfig.toml index c1b5bb8..a7f9752 100644 --- a/.jjconfig.toml +++ b/.jjconfig.toml @@ -3,5 +3,13 @@ name = "Daniel Lundin" email = "dln@arity.se" [ui] -default-command = "log" -diff-editor = "vimdiff" +default-command = "l" +diff-editor = ["scm-diff-editor", "--dir-diff", "$left", "$right"] +pager = ["delta", "--line-numbers", "--max-line-distance=0.9"] + +[aliases] +l = ["log", "--ignore-working-copy", "-r", "(main..@): | (main..@)-"] +la = ["log", "--ignore-working-copy", "-r", "all()"] +b = ["branch", "list"] +n = ["new", "main"] +d = ["diff"]