update git configs to use push.default=simple, and make aliases consistent