From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 30 Dec 2006 12:54:09 GMT
Subject: Re: What's cooking in git.git (topics)
Message-ID: <Pine.LNX.4.63.0612301350580.19693@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <45965A82.8030903@gmx.net>

Hi,

On Sat, 30 Dec 2006, Raimund Bauer wrote:

> * Johannes Schindelin wrote, On 30.12.2006 12:22:
> > (Of course, the correct thing would not be "git reset --hard", but rather
> > "git diff --ours | git apply -R; git reset", but that's a tad long, no?)
> Then maybe introduce "git reset --ours" which does exactly that?

That is possible.

But does it make sense? 

It is a volatile state, and errors are too easy. So I think it makes sense 
to have to _ask_ for such a state.

(Having said that, I think that it actually might make sense for bisecting 
an error where you _need_ a local patch to get it running to begin with.)

Ciao,
Dscho