From: Raimund Bauer <ray007@gmx.net>
Date: Sat, 30 Dec 2006 12:24:34 GMT
Subject: Re: What's cooking in git.git (topics)
Message-ID: <45965A82.8030903@gmx.net>
In-Reply-To: <Pine.LNX.4.63.0612301217010.19693@wbgn013.biozentrum.uni-wuerzburg.de>

* 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?

-- 
best regards

  Ray