Skip to content

Commit 040233f

Browse files
authored
Merge pull request #1194 from Splarv/fig28
Add link to the mentioned figer 28
2 parents 5df317d + e6d4900 commit 040233f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

book/03-git-branching/sections/rebasing.asc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ image::images/basic-rebase-1.png[Simple divergent history.]
1515
The easiest way to integrate the branches, as we've already covered, is the `merge` command.
1616
It performs a three-way merge between the two latest branch snapshots (`C3` and `C4`) and the most recent common ancestor of the two (`C2`), creating a new snapshot (and commit).
1717

18+
[[rebasing-merging-example]]
1819
.Merging to integrate diverged work history
1920
image::images/basic-rebase-2.png[Merging to integrate diverged work history.]
2021

@@ -48,7 +49,7 @@ $ git merge experiment
4849
.Fast-forwarding the master branch
4950
image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
5051

51-
Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in the merge example.
52+
Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in <<rebasing-merging-example,the merge example>>.
5253
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
5354
If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.
5455

0 commit comments

Comments
 (0)