Automatic restack?

[amyreese]

There's many cases when iterating on a stack of commits that I want to make changes to the commits further up the stack. In these cases, when I run git fixup or git commit --amend, it would be really handy if it could automatically run git restack for me, so I don't need to run the second command every time.

Maybe add this as an optional feature via git config branchless.restack.automatic or similar?

[claytonrcarter]

Have you tried the existing amend, record --insert, and move (with --insert and --fixup flags) commands? I suspect that those may fit your needs: they amend/insert/move/combine commits in your stack and perform an automatic restack/rebase. (You may still have to run restack --merge occasionally, for example if the automatic rebase fails due to conflict.)

We also recently merged a new split command (available on main, but not yet released) that can extract changes to specific files from commits, with automatic restack/rebase.

(Oops, I'm noting that the wiki page for move doesn't mention --fixup. It was added in v0.8 though.) Added.

[amyreese]

I was not aware of amend, so thank you, but I often want to update the commit message as well, and

git amend never updates the commit message, only the commit contents
sounds like it doesn't fully suit my workflow. :|

[claytonrcarter]

Have you tried reword? There is no capability in git-branchless to amend the contents and message of a commit at the same time, but there are ways to do both via separate commands that could be scripted together.

[amyreese]

Thank you, that would probably be sufficient. I guess I just need to pay more attention to the docs and change my workflow habits to use the right commands. 😅