autostash more correctly