Quick add-on comment: "git rebase" is a nice way for an individual developer to avoid spurious merges or clean up their history before pushing it to a shared r

Quick add-on comment: "git rebase" is a nice way for an individual developer to avoid spurious merges or clean up their history before pushing it to a shared repository. But (as Linus and others have said) it should never be used on commits after they've been pushed from the developer's workstation to the public/shared repo. That will rewrite history that other branches may depend on, and will cripple git's ability to intelligently do repeated merges between branches.