From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Oct 2005 09:26:06 GMT
Subject: Re: cg-merge should use git-merge
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.