Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

jj: Switch manual commit splitting alias to use split

Browse source 
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.
This commit is contained in:
Marty Oehme 2025-02-21 17:01:16 +01:00
parent 612b92d148
commit 66005a9948
Signed by: Marty
GPG key ID: 4E535BC19C61886E
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vcs/jj/config/sh/alias.d/jj.sh
View file

@ -36,9 +36,8 @@ alias jsi="jj squash --interactive"
# oops buttons # oops buttons
alias ju="jj undo" alias ju="jj undo"
# for damn,-forgot-to-split-this-commit workflow # allows you to split the current change into multiple
# Creates a new commit before with your selected changes, lets you describe it and carry on alias ji="jj split"
alias ji="jj new -B@ --no-edit && jj squash --interactive && jj edit '@-' && jj describe && jj edit '@+'"
# revset info # revset info
alias jl="jj log -T builtin_log_oneline" alias jl="jj log -T builtin_log_oneline"