Rebasing Branches - Git Recipes - page 258

base command. You have to move whole branches and then reproduce the merge com-
mits.
Take a good look at Figure 7-13 . The commits b1 and b2 are denoted with two
primes b1'' and b2'' . Double primes underline the fact that these are new commits.
They introduce the same changes as b1' and b2' in Figure 7-12 and as b1 and b2 in
Figure 7-8 but their SHA-1 names are different.
7-9. Preserving merges during rebase
Problem
Your repository looks like Figure 7-14(a) . You want to rebase the feature branch
onto the master branch preserving bulbs. The repository you want to achieve is
shown in Figure 7-14(b) .