better aliases

This commit is contained in:
Jana Dönszelmann 2025-09-26 10:36:35 -07:00
parent 816c61985d
commit c89bd50f8e
No known key found for this signature in database
4 changed files with 150 additions and 31 deletions

View file

@ -12,9 +12,15 @@
ui = {
paginate = "never";
pager = "${pkgs.delta}/bin/delta";
# pager = "${pkgs.delta}/bin/delta";
# for delta
diff-formatter = ":git";
# diff-formatter = ":git";
diff-formatter = [
"${pkgs.difftastic}/bin/difft"
"--color=always"
"$left"
"$right"
];
default-command = [
"log"
@ -52,33 +58,60 @@
"format_timestamp(timestamp)" = "timestamp.ago()";
};
aliases = {
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@-)"
"--to"
"@"
];
catchup = [
"rebase"
"-b"
"all:current"
"-d"
"tronk()"
"--skip-emptied"
];
move = [
"rebase"
"-r"
];
mdiff = [
"diff"
"--from"
"tronk()"
];
};
aliases =
let
util = script: [
"util"
"exec"
"--"
"bash"
"-c"
script
];
in
{
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@-)"
"--to"
"@"
];
catchup = [
"rebase"
"-b"
"all:current"
"-d"
"tronk()"
"--skip-emptied"
];
pull = util ''
jj git fetch
jj catchup
'';
ch = [
"show"
"--stat"
];
st = [
"status"
];
move = [
"rebase"
"-r"
];
ll = [
"log"
"-T"
"builtin_log_compact"
];
mdiff = [
"diff"
"--from"
"tronk()"
];
};
templates = {
log_node = ''