I’m very unclear on the difference between rebase and merge, and after reading the book and looking at the man pages I’m even more confused.
First, the book seems to disagree with the git-rebase man page about what rebase does to a repository. On pages 34-35, figures 3.1 and 3.2 show that a rebase operation takes two branches and — I have to say it — merges them into one, interleaving commits. However, the “man page”:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html has a diagram that appears to append commits.
Second, after reading “this page”:http://changelog.complete.org/archives/586-rebase-considered-harmful (“Rebase Considered Harmful”) I’m puzzled: why does chapter 3 use rebase at all, as opposed to merge? Isn’t merging really what we’re after in this situation?
All I know about version control I learned from svn, which is probably why I’m so baffled. Please forgive (and point out) any bad assumptions I’ve made. :)