Leave working dir and index alone after failed (conflicting) push