git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: cg-merge should use git-merge

From
Junio C Hamano <junkio@cox.net>
Date
Oct 17, 2005, 09:26 UTC
Message-ID
<7vach81olt.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<46a038f90510170203ndee2b2bi913b62014614f68e@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> writes:
> Something like a manual merge that I could force to happen on command
>
>    git-doarbitrarymergeontree -r fromtree:totree  [ victimtree ]
>
That essentially is a simple one-liner:
     git-read-tree -m -u fromtree HEAD totree

which is more or less what git-cherry-pick and git-revert do, except fromtree always is totree^ in git-cherry-pick.

Previous: Junio C HamanoNext: Martin Langhoff
Message 2 of 4 in “Re: cg-merge should use git-merge”
  1. Junio C HamanoOct 17, 2005
  2. Junio C HamanoOct 17, 2005
  3. Fwd: cg-merge should use git-mergeMartin Langhoff, Oct 19, 2005
  4. Martin LanghoffOct 20, 2005

Read the whole thread, see it on lore, or plain text.

$ 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.