Information Technology Reference
In-Depth Information
Figure 7-7
.
The starting point and the result of joining divergent branches into linear history
Solution
Clone the repository from Recipe 6-4 with branches:
$ cd git-recipes
$ git clone-with-branches 06-04 07-03
$ cd 07-03
and then follow the steps:
1. Rebase the
feature
branch onto the
master
branch with
$ git
rebase master feature
2. Rebase the
master
branch onto the
feature
branch with
$ git
rebase feature master
How It Works
We start with the repository shown in
Figure 7-7(a)
.
The first step in this recipe per-
forms the operation described in Recipe 7-1. After
$ git rebase master fea-
