Re: [PATCH v2 00/17] Use merge_recursive() directly in the builtin am

2016-07-07 Thread Johannes Schindelin
Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This is the second iteration of the long-awaited re-roll of the attempt to > > avoid spawning merge-recursive from the builtin am and use merge_recursive() > > directly instead. > > I wanted to queue this i

Re: [PATCH v2 00/17] Use merge_recursive() directly in the builtin am

2016-07-06 Thread Junio C Hamano
Johannes Schindelin writes: > This is the second iteration of the long-awaited re-roll of the attempt to > avoid spawning merge-recursive from the builtin am and use merge_recursive() > directly instead. I wanted to queue this in 'pu', but an unfortunate series that changes the convert_to_git()

[PATCH v2 00/17] Use merge_recursive() directly in the builtin am

2016-07-05 Thread Johannes Schindelin
This is the second iteration of the long-awaited re-roll of the attempt to avoid spawning merge-recursive from the builtin am and use merge_recursive() directly instead. The *real* reason for the reroll is that I need a libified recursive merge to accelerate the interactive rebase by teaching the