Skip to content

Commit f526076

Browse files
committed
Merge pull request #103 from pableu/master
Change C3' to C4' in rebasing.asc
2 parents 1605e40 + f0e86d6 commit f526076

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $ git merge experiment
4848
.Fast-forwarding the master branch
4949
image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
5050

51-
Now, the snapshot pointed to by `C3'` is exactly the same as the one that was pointed to by `C5` in the merge example.
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.
5252
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
5353
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.
5454

0 commit comments

Comments
 (0)