Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-21 Thread Elijah Newren
Hi Dscho, On Mon, Jan 21, 2019 at 1:01 PM Johannes Schindelin wrote: > > Hi Elijah, > > On Mon, 21 Jan 2019, Johannes Schindelin wrote: > > > On Tue, 11 Dec 2018, Elijah Newren wrote: > > > > > Differences since v3 (full range-diff below): > > > - Fixed the redundant "fatal: error:" error messa

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-21 Thread Johannes Schindelin
Hi Junio, On Fri, 18 Jan 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Fri, 18 Jan 2019, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > I am about to submit a new iteration of my patch series, would it > >> > be too much trouble for you to rebase o

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-21 Thread Johannes Schindelin
Hi Elijah, On Mon, 21 Jan 2019, Johannes Schindelin wrote: > On Tue, 11 Dec 2018, Elijah Newren wrote: > > > Differences since v3 (full range-diff below): > > - Fixed the redundant "fatal: error:" error message prefixes, as pointed > > out by Duy > > - Rebased on 2.20.0 > > - Fixed

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-21 Thread Johannes Schindelin
Hi Elijah, On Tue, 11 Dec 2018, Elijah Newren wrote: > Differences since v3 (full range-diff below): > - Fixed the redundant "fatal: error:" error message prefixes, as pointed > out by Duy > - Rebased on 2.20.0 - Fixed the "comptable" tyop This, and the range-diff, look reasonable t

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Fri, 18 Jan 2019, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > I am about to submit a new iteration of my patch series, would it be too >> > much trouble for you to rebase on top? If it would be, let me know, then I >> > will reba

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Johannes Schindelin
Hi Junio, On Fri, 18 Jan 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I am about to submit a new iteration of my patch series, would it be too > > much trouble for you to rebase on top? If it would be, let me know, then I > > will rebase on top of yours. > > Or both of you k

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Elijah Newren
On Fri, Jan 18, 2019 at 9:55 AM Junio C Hamano wrote: > > Johannes Schindelin writes: > > > I am about to submit a new iteration of my patch series, would it be too > > much trouble for you to rebase on top? If it would be, let me know, then I > > will rebase on top of yours. > > Or both of you k

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Junio C Hamano
Johannes Schindelin writes: > I am about to submit a new iteration of my patch series, would it be too > much trouble for you to rebase on top? If it would be, let me know, then I > will rebase on top of yours. Or both of you keep the topics as-is and self-consistent, and let the rerere machiner

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Johannes Schindelin
Hi Elijah, On Fri, 18 Jan 2019, Johannes Schindelin wrote: > On Mon, 7 Jan 2019, Elijah Newren wrote: > > > Dscho: Looks like our series conflicts slightly. Would you like me to > > rebase mine on top of yours and squash the following change into > > commit c91c944a068e ("rebase: define lineari

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-18 Thread Johannes Schindelin
Hi Elijah, On Mon, 7 Jan 2019, Elijah Newren wrote: > On Mon, Jan 7, 2019 at 12:11 PM Junio C Hamano wrote: > > > > Junio C Hamano writes: > > > > > Elijah Newren writes: > > > > > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: > > >>> > > >>> This series continues the work of making

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-11 Thread Elijah Newren
Hi Junio, A small update... On Mon, Jan 7, 2019 at 12:39 PM Elijah Newren wrote: > On Mon, Jan 7, 2019 at 12:11 PM Junio C Hamano wrote: > > Junio C Hamano writes: > > > > > Elijah Newren writes: > > > > > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: > > >>> > > >>> This series co

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-07 Thread Elijah Newren
Hi, On Mon, Jan 7, 2019 at 12:11 PM Junio C Hamano wrote: > > Junio C Hamano writes: > > > Elijah Newren writes: > > > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: > >>> > >>> This series continues the work of making rebase more self-consistent > >>> by removing inconsistencies betw

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-07 Thread Junio C Hamano
Junio C Hamano writes: > Elijah Newren writes: > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: >>> >>> This series continues the work of making rebase more self-consistent >>> by removing inconsistencies between different backends. In >>> particular, this series focuses on making the

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-07 Thread Junio C Hamano
Elijah Newren writes: > On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: >> >> This series continues the work of making rebase more self-consistent >> by removing inconsistencies between different backends. In >> particular, this series focuses on making the merge machinery behave >> like t

Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2019-01-07 Thread Elijah Newren
On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote: > > This series continues the work of making rebase more self-consistent > by removing inconsistencies between different backends. In > particular, this series focuses on making the merge machinery behave > like the interactive machinery (thoug

[PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

2018-12-11 Thread Elijah Newren
This series continues the work of making rebase more self-consistent by removing inconsistencies between different backends. In particular, this series focuses on making the merge machinery behave like the interactive machinery (though a few differences between the am and interactive backends are