Am 06.01.24 um 20:05 schrieb Yann Dirson: > The "core + 1 variant" case pretty much works out of the box, with --rebase-merges > and --update-refs generating a perfect instructions sheet. > > But if I was to rebase just one variant while rewriting the core branch, obviously > all other variants would still fork off the pre-rewrite core branch, and we'd loose > all chances of automating the same work on the other variants. > > OTOH, if I get `git-rebase` to generate the instruction sheets for those other > variants first, strip them (manually) from the common part, and insert them in the > instruction sheet of my "core + 1 variant" case ... I do get the whole of my branches > rebased together, and sharing the updated core. Not a complete automation, but... You can merge all variant branches into a temporary branch (or detached HEAD), even if that are merely -s ours merges, and then rebase the temporary branch with --rebase-merges --update-refs. This will generate the instruction sheet that you want. You can remove the final merge instructions (the temporary ones) from the instruction sheet if you do not want them to be executed. -- Hannes
