From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 14 Dec 2010 07:23:12 GMT
Subject: Re: What's cooking in git.git (topics)
Message-ID: <4D071B60.2040906@viscovery.net>
In-Reply-To: <20101213214628.GA13447@onerussian.com>

Am 12/13/2010 22:46, schrieb Yaroslav Halchenko:
> On Mon, 13 Dec 2010, Junio C Hamano wrote:
>> But for such a use case, "git read-tree -m -u 0.2" would work just as
>> well, and discussion ended there ;-)
> 
> hm -- read-tree sounded like yet another unknown to me feature of GIT I
> was trying desperately to discover ;)  unfortunately it doesn't produce a merge
> for me :-/ -- just a simple commit with the state taken from the other tree:

How about:

  git merge --no-commit -s ours 0.2
  git read-tree -m -u 0.2
  git commit -m "Reset to 0.2"

-- Hannes