Always pull with `git pull --rebase`

http://mislav.uniqpath.com/2013/02/merge-vs-rebase/