Git - rebasing a set of branches

Question

If I have a set of branches with common ancestor commit a, is there an easy way to rebase all of them onto commit b (where the common ancestor of a and b might be some third commit c)?

Are you trying to rebase the commits since a on each branch, or the commits since c on each branch? — Lily Ballard
– Lily Ballard, Commented Feb 8, 2012 at 20:47
See also how I'd rebase a whole subhistory -- several branches, with some links between them resulting from merge. The unpleasant part of that solution is the need to reset the topic branch refs to the new rebased commits afterwards. — imz -- Ivan Zakharyaschev
– imz -- Ivan Zakharyaschev, Commented Mar 14, 2012 at 22:04

sehe · Accepted Answer · 2012-02-08 20:48:32Z

Yes. Just rebase them all.

If you anticipate repeated conflicts, enable git-rerere, which records your conflict resolutions and is able to automatically apply the same resolution when merge encounters the exact same conflicts in another (re)merge.

see http://progit.org/2010/03/08/rerere.html

Or you could,

Isolate commit a in a branch
```
 git checkout -b temporary <commita> 
```
Rebase the temporary branch onto commit b.
Rebase all the 'related' branches onto the resulting branch temporary

Collectives™ on Stack Overflow

Git - rebasing a set of branches

1 Answer 1

Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Linked

Related