Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Apr 16, 2013, 03:09 UTC
Message-ID: <20130416030948.GJ3262@elie.Belkin>
In-Reply-To: <vpqbo9gqcvl.fsf@grenoble-inp.fr>

Matthieu Moy wrote:

> Junio C Hamano <gitster@pobox.com> writes:

Show 5 quoted lines

>> Yes, that is why I said for pull-merge, --authsquash is neutral-to-better
>> and pull.autosquash is harmful.
>
> To speak from my experience: I find myself typing "git stash && git pull
> && git stash pop" relatively often.

To that end, maybe "git pull --stash" would be an easier to type option name than "git pull --autostash".

That would also avoid the question of "What is automatically going to happen here? Is it going to stash only sometimes? Is it going to automatically stash what I pull?".

I'm not a big stash user (except "git stash --keep-index" to prepare to test changes in the index), so I can't say much more about the details.

Thanks, Jonathan