Git config to merge upstream branch by default.
Merge branch 'master' of https://github.com/apbarrero/.dotfiles