Add commit to the tip of a lower branch in the stack

[aboqasem]

Thanks for this awesome tool!

I would like to commit changes like this:

feature-2
  commit-4
  commit-3
feature-1
  -> add a commit here
  commit-2
  commit-1
master

Maybe "Add a commit after this commit" when I select commit-2 would do.

[stefanhaller]

For fixup commits lazygit already does this automatically, so there's a rather non-obvious way to achieve what you want:

• select any commit of the lower branch (doesn't matter which one)
• press shift+F, enter
• reword the fixup commit that was created at the end of feature-1

The other, more obvious way is unfortunately slightly more cumbersome than it should be: create the commit normally at the tip of the stack and move it down. The reason is that when you move it down outside of an interactive rebase, it ends up at the beginning of the second branch rather than the end of the first; to avoid that, you need to select commit-2 (or any other commit of the lower branch), hit e, and then move it to before the update-ref entry. Moving commits in an interactive rebase is much faster anyway, so it may be a good habit to get into anyway. Ideas for improving this are welcome.

A third way is to stash your changes, hit e on commit-2, pop the stash, commit, and continue the rebase.

Maybe "Add a commit after this commit" when I select commit-2 would do.

That's true, but it seems like a bit of an uncommon thing (outside of stacked branches, where you can easily move the commit after creating it), so I'm hesitant to waste a keybinding on it.

[stefanhaller]

I opened #6180 to improve the situation with moving the commit down. You can now create the commit at the tip of the stack, and then drag it down with mouse to the end of the first branch; during the drag gesture an extra row appears for the branch head, so you can decide to drop it before (end of first branch) or after that (beginning of second branch). It also makes it easier to do the same with <ctrl+j> without having to enter an interactive rebase; see PR description.

I'm not entirely decided yet whether I like this new behavior; testing and feedback welcome.

[aboqasem]

Thanks a lot @stefanhaller for the prompt response and action! I really appreciate it.

I have been using i for interactive rebase and moving the commit just before the update-ref similar to what you mentioned. It works really well and it's much faster than just <ctrl+j>.

The PR would still be a great addition and I believe it's more intuitive. I faced an issue multiple times where I move a commit down rewriting the tip of the previous branch and having to then fix it.

Thank you!