From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 15 Apr 2013 13:45:02 GMT
Subject: Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash
Message-ID: <vpqbo9foqld.fsf@grenoble-inp.fr>
In-Reply-To: <CALkWK0nymT=wTnHpTE=uBsqoHxACFb4gStU0SGE79bc7uBVKXQ@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> First, this is not why Junio said pull.autostash is harmful: he had a
> completely different objection.

Yes. This is another objection.

> Second, this makes no sense.  The user consciously made the decision
> to set pull.autostash to true

... possibly a long time ago.

> This case is roughly equivalent to the user executing 'git stash' and
> suddenly waking up one day and complaining "WTF, where are my
> important changes?!?".

I disagree. A configuration option is something you set once, and then
forget about. A command, or a command-line option, is something you
explicitely add when you need it.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/