Also a big fan of https://gitlab.com/wavexx/git-assembler https://gitlab.com/wavexx/git-assembler (and previously topgit). Works with the basic idea that you ca

Also a big fan of https://gitlab.com/wavexx/git-assembler 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.