Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

Hi Ralf, On Wed, 7 Sep 2016, Ralf Thielow wrote: > 2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker : > > Hi Ralf, > > > > There are quite a few patch series in flight these days around > > interactive rebase. Have you checked for conflicts with those? > > > > Thanks. I did

Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

Dennis Kaarsemaker writes: > There are quite a few patch series in flight these days around > interactive rebase. Have you checked for conflicts with those? IIRC, Ralf's fix would need to be ported to C version, and when it happens, it won't just be a mere conflict but

Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker : > Hi Ralf, > > There are quite a few patch series in flight these days around > interactive rebase. Have you checked for conflicts with those? > Thanks. I did not check against 'pu' when I created this patch but I'm able to

Re: [PATCH v2] rebase -i: improve advice on bad instruction lines

Hi Ralf, There are quite a few patch series in flight these days around interactive rebase. Have you checked for conflicts with those? On di, 2016-09-06 at 20:59 +0200, Ralf Thielow wrote: > If we found bad instruction lines in the instruction sheet > of interactive rebase, we give the user