You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/03-git-branching/sections/rebasing.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -48,7 +48,7 @@ $ git merge experiment
48
48
.Fast-forwarding the master branch
49
49
image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
50
50
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.
52
52
There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
53
53
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.
0 commit comments