From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Dec 2006 08:22:16 GMT
Subject: Re: [RFC/PATCH] git-reset to remove "$GIT_DIR/MERGE_MSG"
Message-ID: <Pine.LNX.4.63.0612050847340.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v4psbknvb.fsf@assigned-by-dhcp.cox.net>

Hi,

On Mon, 4 Dec 2006, Junio C Hamano wrote:

>  * Marked as RFC because I suspect I am missing a valid use case
>    where a user might want to say "reset" as part of continuing
>    the conflicted merge resolution, although I do not think of
>    any offhand...

I can only speak for myself, of course: When I use git-reset in a merge, 
more often than not I use "--hard", in which case I want to try something 
different. So yes, I like this patch.

The only possible exception I can think of: git-reset --mixed when a 
merge failed.

Ciao,
Dscho