From 66005a9948fc7cb8d5465a5a29c941a8dbe4f7fe Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 21 Feb 2025 17:01:16 +0100 Subject: [PATCH] jj: Switch manual commit splitting alias to use split Currently `ji` (for jj insert) does a 'manual' `jj split` by creating an empty commit underneath, squasing interactively and then moving back to the original. All of that is done by the existing `jj split` command. So we simply use it. I am keeping the `ji` alias for now, could still be 'jj insert' or 'jj spl(I)t' I suppose. --- vcs/jj/config/sh/alias.d/jj.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vcs/jj/config/sh/alias.d/jj.sh b/vcs/jj/config/sh/alias.d/jj.sh index b6046b4..4c603c7 100644 --- a/vcs/jj/config/sh/alias.d/jj.sh +++ b/vcs/jj/config/sh/alias.d/jj.sh @@ -36,9 +36,8 @@ alias jsi="jj squash --interactive" # oops buttons alias ju="jj undo" -# for damn,-forgot-to-split-this-commit workflow -# Creates a new commit before with your selected changes, lets you describe it and carry on -alias ji="jj new -B@ --no-edit && jj squash --interactive && jj edit '@-' && jj describe && jj edit '@+'" +# allows you to split the current change into multiple +alias ji="jj split" # revset info alias jl="jj log -T builtin_log_oneline"