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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Jan 18, 2019 at 9:55 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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 machinery to squash it in when the two topics gets
> merged.

Yeah, I see that commit 8d808e12a2cc ("Merge branch 'js/rebase-am'
into jch", 2019-01-17) has my fix squashed in; thanks Junio.

I'm happy to do whatever is needed with en/rebase-merge-on-sequencer
that makes it easiest for everyone else.  I'm assuming right now that
there's nothing I should do to improve it, but if anyone wants me to
rebase it or fix something up, just let me know.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux