Do not use `git pull`

H/T: http://stackoverflow.com/a/15316602

Instead of git pull, use the git up alias:

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