Interactively moving revision(s)

[matze]

One thing that is still easier for me with interactive Git rebases is re-ordering one or more commits/revisions. To swap two commits it's just swapping the lines in the interactive rebase view. In jj(ui) I can do the same by rebasing the to-be-moved revision onto the target, rebasing the descendents and then creating a new revision on top. This is a bit unwieldy, so something like alt+j/k to move revisions around would be a nifty addition.

[nickchomey]

Are the various flags (which are exposed by shortcuts in jjui) at all useful for you for rebasing branches/descendents with the parent commit? Likewise before/after?

https://jj-vcs.github.io/jj/latest/cli-reference/#jj-rebase

[idursun]

I think this exact same thing was asked in the jj's jjui discord channel:

The recommendation from @zerowidth was:

doable with custom commands:

[custom_commands."move commit down"]
key = ["J"]
args = ["rebase", "-r", "$change_id", "--insert-before", "$change_id-"]

[custom_commands."move commit up"]
key = ["K"]
args = ["rebase", "-r", "$change_id", "--insert-after", "$change_id+"]

the rebase UI works pretty well for this already, though -- hit r then b then j to select the parent revision to move a commit down, and r then a k to select a descendant for moving a commit "up" (edited)

[vic]

It would be nice to add this to our wiki. I don't have discord, but I'm sure many of the recommendations and tips people make there could be of help (and more searchable) if we have them documented them on the wiki, other people might find it helpful.

[matze]

Thanks, that's almost perfect (besides I mapped it now to alt+j/k). Just need to find a way to keep the moved revision selected. Sure r b/a j/k works too but it requires more mental capacity 🙈

P.S.: agree with @vic if that was indexed and found by Google and/or GitHub, I wouldn't have asked in the first place. In fact, I spend about ten minutes to see if anyone had the same question.

[idursun]

I agree, I will start collecting custom commands that folks have come up with in the wiki.

[idursun]

For the time being, I listed some here: https://github.com/idursun/jjui/wiki/Custom-Commands#example-custom-commands-from-the-community

[nickchomey]

This is great. As matze said, keeping the moved revision selected would be helpful

[barries]

FWIW, this is one of the features I miss coming from lazygit: you can use Ctrl-J and Ctrl-K.

This is a huge convenience factor, worthy of being built-in, especially to make Git gui/tui refugees like me feel at home!

It might make any error handling better (usually the UI for user subcommands like this suffer when non-happy-path things happen).