Browse files

This should be C3', not C3.

  • Loading branch information...
1 parent d863102 commit a0228aee3c4af8ed744b71456d0e1ed55891f9e4 @dilipm dilipm committed Feb 12, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 en/03-git-branching/01-chapter3.markdown
View
2 en/03-git-branching/01-chapter3.markdown
@@ -507,7 +507,7 @@ At this point, you can go back to the master branch and do a fast-forward merge
Insert 18333fig0330.png
Figure 3-30. Fast-forwarding the master branch.
-Now, the snapshot pointed to by C3 is exactly the same as the one that was pointed to by C5 in the merge example. There is no difference in the end product of the integration, but rebasing makes for a cleaner history. 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.
+Now, the snapshot pointed to by C3' is exactly the same as the one that was pointed to by C5 in the merge example. There is no difference in the end product of the integration, but rebasing makes for a cleaner history. 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.
Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain. In this case, you’d do your work in a branch and then rebase your work onto `origin/master` when you were ready to submit your patches to the main project. That way, the maintainer doesn’t have to do any integration work — just a fast-forward or a clean apply.

0 comments on commit a0228ae

Please sign in to comment.