As this was recently discussed, just found this "few months old" blog post: (talks about git and mercurial) http://blog.experimentalworks.net/2009/03/merge-vs-rebase-a-deep-dive-into-the-mysteries-of-revision-control/ -Doug