The Case for Pull Rebase
Enrico Campidoglio on his blog megakemp.com:
[…] git pull isn’t actually a core command per se, but rather a combination of two other commands: git fetch and git merge; the former downloads any missing commits from a remote repository, while the latter merges them into your current branch.
Very educational post, and great recommendation. I’ve been bouncing off the article here in the office, and even if you don’t go ahead with his reco, the discussions started have been useful.