Great article on Git merge vs rebase

Succinct review of the concepts, forwarded to me from a friend at work

getting solid at git rebase vs merge