set explicit push setting
merged
new commits?
...
Merge branch 'master' of github.com:jldailey/dotfiles
avoiding a conflict in .gitconfig