autorebase VS git-assembler

> It should be possible to sync all of my branches (or some subset) via merge or rebase, in a single operation.

Not sure if this is exactly what the author is looking for but I made Autorebase exactly for this.

https://github.com/Timmmm/autorebase

Great article btw. A lot of those things are way harder than they should be.

That sounds great! I have partly solved this issue in my autorebase tool (https://github.com/Timmmm/autorebase) - it basically rebases every branch, and fixes the commit time so that stacked branches get preserved even after a rebase just because the hashes all match properly.

That obviously doesn't work if you modify or drop any of the commits, so this option is very welcome!

I have a tool that will automatically pull master and rebase all of your branches onto it, or as far as it can without conflicts.

I use a similar workflow and also got fed up with constantly rebasing branches so I made Autorebase to do it for me. It works really well and there were a surprising number of edge cases to handle, e.g. what happens when you run it from another worktree? What happens if the branch you want to rebase is checked out in another worktree? Etc.

Also a big fan of https://gitlab.com/wavexx/git-assembler (and previously topgit). Works with the basic idea that you can rebuild branches by combining, merging or rebasing automatically on top of others. I frequently use this to build a local branch which is an amalgamation of the main branch + required patches so that I can work (and later submit) on a clean branch without being blocked.