thoughtbot/dotfiles — pull request #111 by croaky (2013-02-28 18:49:49+00:00)
Title: Always pull with `git pull --rebase`

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