Revert "Set git push default to simple"

This reverts commit ac81e8de76df239592f3745308adbffd55ce7b65.
Revert "Fix git prompt (was wrong after update)"

This reverts commit b9e4f41496abd27baeb7fc66194e69adcc6401b2.