Rebasing Branches - Git Recipes - page 255

Recipe 7-6 consists of two steps:
• First we used Recipe 7-1 to transform the repository shown in Figure 7-1 .
• Next we used Recipe 6-6 to perform a merge that forms a bulb.
7-7. Creating bulbs in subbranches
Problem
You repository looks like Figure 7-12(a) . You want to merge the brave-idea branch
back into the feature branch as a bulb. The repository you wish to achieve is shown
in Figure 7-12(b) .
Figure 7-12 . The repositories considered in Recipe 7-7
Solution