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 not check against 'pu' w
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 will disappear from
the sc
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 apply without any conflict
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 advic
If we found bad instruction lines in the instruction sheet
of interactive rebase, we give the user advice on how to
fix it. However, we don't tell the user what to do afterwards.
Give the user advice to run 'git rebase --continue' after
the fix.
Signed-off-by: Ralf Thielow
---
Changes in v2:
- a
5 matches
Mail list logo