git: pull.rebase = true

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