Thread (1 message) 1 message, 1 author, 2016-06-15

Re: cg-merge should use git-merge

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:09

Martin Langhoff [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help