From 2eccfe88ec97b933b560e287e07ead7ae48bf4fc Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 10 Feb 2025 14:45:04 +0100 Subject: [PATCH] jj: Improve default log invocation The default log invoked when hitting `j` is now composed of the working copy history as well as all ancestors, recent commits to visible heads and the trunk. `jl` shows the same view, only as oneline commits. --- vcs/jj/config/sh/alias.d/jj.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcs/jj/config/sh/alias.d/jj.sh b/vcs/jj/config/sh/alias.d/jj.sh index a68adf2..db2422a 100644 --- a/vcs/jj/config/sh/alias.d/jj.sh +++ b/vcs/jj/config/sh/alias.d/jj.sh @@ -4,7 +4,7 @@ if ! exist jj; then return 1 fi -alias j='jj' # necessary for a thing as easy to type? +alias j="jj log -r '@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()'" if exist lazyjj; then alias lj="lazyjj" fi @@ -16,7 +16,7 @@ alias jds="jj describe" alias jc="jj commit" alias jln="jj log -T builtin_log_oneline" -alias jl="jj log -r '@ | ancestors(remote_bookmarks().., 2) | trunk()'" +alias jl="jj log -r '@ | ancestors(trunk()..(visible_heads() & mine()), 3) | trunk()' -T builtin_log_oneline" alias jL="jj log -r 'all()'" alias jlo="jj log --summary" alias jLO="jj log --summary -r 'all()'"