Re: [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 26, 2014, 20:48 UTC
Message-ID: <20140226204843.GN7855@google.com>
In-Reply-To: <CADgNjanavxZfuXgvEAOMzPAJr9YqAvF4+ZDq9KW9aeR_PcVo-Q@mail.gmail.com>

Andrew Wong wrote:

> Yeah, this breaks compatibility, but like I said, during a merge, I don't
> see a good reason to do "git reset --mixed", and not "git reset --merge".

Yeah, in principle if it had a different behavior, then plain "git reset" could be useful during a merge, but as is, I tend to use the form with a path ("git reset -- .") to avoid losing MERGE_HEAD.

I really don't like the idea of making "git reset" modal, though. I'd rather that reset --mixed print some advice about how to recover from the mistake, which would also have the advantage of allowing scripts that for whatever reason used "git reset" in this situation to continue to work.

Thanks, Jonathan