Use push.default=simple which is becoming default in git 2.0