Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()

From: Stephan Beyer <hidden>
Date: 2016-06-15 22:45:09

Hi,

Junio C Hamano wrote:
The scripted version of revert/cherry-pick used git-merge-recursive
because that is the Porcelain API available, and the current C-rewrite
uses it as well, but if we are rewriting it to call merge-recursive
machinery directly, it should be making a single merge request to
merge_trees(), not "recursive" one.
This is an interesting point.
So perhaps we don't need stuff like my regarding merge_recursive_generic(),
at least not for revert/cherry-pick.

Regards,
  Stephan

-- 
Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help