Re: [PATCH] reset: --unmerge

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 25, 2016, 23:28 UTC
Message-ID: <xmqqmvhsc8kn.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CACsJy8D4cT2EV_t6=+XTHxLmjV+NtAE+KgiN3ZiP7JQzvu29oQ@mail.gmail.com>

Duy Nguyen <pclouds@gmail.com> writes:

> BTW making git-add (and "git commit -a") refuse files with conflict
> markers present could prevent this mistake earlier and is probably a
> better option because the user won't have to discover 'reset
> --unmerge'.

That may help some users, but you are solving a different problem.

I do not say "save" unless I know the editor buffer contents is not ready. "This is ready to be saved" however is different from "This resolution is correct", and I need the unmerged states in the index to verify, namely by looking at "git diff" (no other parameters) output that shows only the paths with unmerged stages and in the compact combined diff format.

Somebody with a bright idea decided that vc-git-resolve-conflicts variable should be on by default in Emacs 25.1 X-<, which causes "save" after resolving conflicts to automatically run "git add", to destroy this valuable tool. My knee-jerk reaction, of course, to such a default is "that's brain dead", but perhaps they did so for some good reason that I fail to fathom.