How to propagate a commit to child branches?

Question

As you can see below, I have nested branches: step-1 is based on step-0, step-2 based on step-1 and so on.

I made a new commit on step-0 named "Updated instruction" (orange highlighted) and now I would like this commit to be applied on every child branches. => Place "Updated instruction" commit between "Update step 0" and "step 1"

Actual

What I would like

I thought to checkout rebase push, one branch by one but I'm not sure it will works and it's a pain.

Answer 1

First, git checkout -b step-1 origin/step-1:

git rebase origin/step-0

After that, git checkout -b step-2 origin/step-2:

git rebase step-1

Repeat until all branches have been linearized:

git checkout -b step-<n> origin/step-<n>
git rebase step-<n-1>

Lastly, git checkout master:

git rebase step-7

When you're done:

git push --force origin step-1 step-2 step-3 step-4 step-5 step-6 step-7 master

Of course that involves a lot of typing, but you can easily automate that in any scripting language. Arguably, you could save the time of writing a script for a one-off job and just get down doing your operations manually. :)