After reading this, I finally motivated myself to read through the man pages for git pull, fetch, merge, and rebase.

Thanks :-)