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

Re: CFT: merge-recursive in C

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

Johannes Schindelin [off-list ref] writes:
quoted
quoted
- I always wondered why merge-recursive did not call merge-base, but did
  its own thing. Hmm?
No idea yet.
A somewhat related issue is that when one head is given I'd
strongly prefer that merge-recursive did not call merge-base nor
did its own thing (that is, for the top-level).  Otherwise we
cannot use it for historyless three tree merge that we need for
rebase/revert/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