What is the difference between 'git pull' and 'git fetch'?

Answer 1

Here is Oliver Steele's image of how all it all fits together:

If there is sufficient interest, I suppose I could update the image to add git clone and git merge...