Further discussion on why 'git pull' can be considered harmful here:

http://stackoverflow.com/questions/15316601/in-what-cases-co...

The top-voted answer has a pretty handy alias:

  git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'