Set push.default to upstream in gitconfig.
Fix layout of gitconfig.