Re: What's cooking in git.git (topics)

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Dec 14, 2010, 07:23 UTC
Message-ID: <4D071B60.2040906@viscovery.net>
In-Reply-To: <20101213214628.GA13447@onerussian.com>

Am 12/13/2010 22:46, schrieb Yaroslav Halchenko:

Show 7 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.