Git merge vs git rebase: avoiding rebase hell

Thorough explanation of the difference between a merge and a rebase along with some nice diagrams.