From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 05 Dec 2006 09:03:51 GMT
Subject: Re: [RFC/PATCH] git-reset to remove "$GIT_DIR/MERGE_MSG"
Message-ID: <Pine.LNX.4.63.0612051000280.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <45752F8E.9020405@op5.se>

Hi,

On Tue, 5 Dec 2006, Andreas Ericsson wrote:

> Johannes Schindelin wrote:
> > 
> > The only possible exception I can think of: git-reset --mixed when a merge
> > failed.
> 
> Indeed, but any invocation of git-reset means you'll quite likely have 
> to re-do the merge to get all changes anyways.

But the working directory still contains the changes (and conflicts) with 
--mixed. A valid workflow would then be to compare to the index directly, 
instead of having to ask "git diff --ours" all the time. And if I'm not 
mistaken, a commit (after cleaning up the conflicts) would not record the 
merge as a merge.

Ciao,
Dscho