How do I rebase a chain of local git branches?

by

2022: I described last August in “Git interactive rebase: how to move other branches (refs) automatically?” a new rebase option --update-ref (Git 2.38, Q3 2022):

Automatically force-update any branches that point to commits that are being rebased.
Any branches that are checked out in a worktree are not updated in this way.

              branch1   branch2
                 |         |
            A----B----C----D
           /
o----o----o----o
               |
             main

git switch branch2
git rebase --update-refs main

                    branch1     branch2
                       |           |
                 A'----B'----C'----D'
                /
o----o----o----o
               |
             main

2013: One-line:

git rebase --onto branch1 branch1tmp branch2

That supposes to make a branch1tmp on branch1 before rebasing branch1.

git checkout branch1
git branch branch1tmp
git rebase master
git rebase --onto branch1 branch1tmp branch2

That being said, check what ORIG_HEAD references.
From git rebase man page:

ORIG_HEAD is set to point at the tip of the branch before the reset.

So check if this would work (and scale better):

git checkout branch1
git rebase master
git rebase --onto branch1 ORIG_HEAD branch2
git rebase --onto branch2 ORIG_HEAD branch3
...

More Related Contents:

  1. Squash my last X commits together using Git
  2. Git refusing to merge unrelated histories on rebase
  3. What is the difference between merge –squash and rebase?
  4. How to squash all git commits into one?
  5. Change first commit of project with Git? [duplicate]
  6. Insert a commit before the root commit in Git?
  7. Combine the first two commits of a Git repository?
  8. Remove folder and its contents from git/GitHub’s history
  9. git rebase, keeping track of ‘local’ and ‘remote’
  10. Rebasing a branch including all its children
  11. git cherry-pick says “…38c74d is a merge but no -m option was given”
  12. How to rebase many branches (with the same base commit) at once?
  13. How to squash my last x commits together?
  14. Rebasing a Git merge commit
  15. How do I squash my last N commits together?
  16. Squash the first two commits in Git? [duplicate]
  17. Can I make fast forwarding be off by default in git?
  18. git rebase and git push: non-fast forward, why use?
  19. How do I use `git rebase -i` after `git merge` without messing things up?
  20. Git commits are duplicated in the same branch after doing a rebase
  21. Hg: How to do a rebase like git’s rebase
  22. Change old commit message using `git rebase`
  23. How to merge two branches without a common ancestor?
  24. How to fix commit order in GitHub pull requests, broken by git rebase?
  25. How to rebase one Git repository onto another one?
  26. Git interactive rebase without opening the editor
  27. Git: How to rebase to a specific commit?
  28. Is there a way to squash a number of commits non-interactively?
  29. Git rebase branch with all parent branches (or dependent sub-branches)
  30. When will `git pull –rebase` get me in to trouble?

Leave a Comment