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

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

Subject: Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
From: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
Date: Fri, 18 Jan 2019 22:03:58 +0100 (STD)
Cc: Elijah Newren <newren@xxxxxxxxx>, Git Mailing List <git@xxxxxxxxxxxxxxx>, Pratik Karki <predatoramigo@xxxxxxxxx>, Phillip Wood <phillip.wood@xxxxxxxxxxxx>
In-reply-to: <xmqqmunxluj8.fsf@gitster-ct.c.googlers.com>
References: <20181122044841.20993-1-newren@gmail.com> <20181211161139.31686-1-newren@gmail.com> <CABPp-BE83Oe15U4yrkcV_-qzWocMS4UcVeG1VEoac-jXgw9Peg@mail.gmail.com> <xmqq4lak8d4g.fsf@gitster-ct.c.googlers.com> <xmqqzhsc6xdk.fsf@gitster-ct.c.googlers.com> <CABPp-BFckuONYcGGkCY3BuPypRULmhsk_OFHyYA2E4jM66BfeQ@mail.gmail.com> <nycvar.QRO.7.76.6.1901181434520.41@tvgsbejvaqbjf.bet> <nycvar.QRO.7.76.6.1901181519230.41@tvgsbejvaqbjf.bet> <xmqqmunxluj8.fsf@gitster-ct.c.googlers.com>
User-agent: Alpine 2.21.1 (DEB 209 2017-03-23)

Hi Junio,

On Fri, 18 Jan 2019, Junio C Hamano 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.

With all the experience I have with rerere, I don't trust it.

Ciao,
Johannes

Follow-Ups:
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Junio C Hamano

References:
- [PATCH v3 0/7] Reimplement rebase --merge via interactive machinery
  - From: Elijah Newren
- [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Elijah Newren
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Elijah Newren
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Junio C Hamano
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Junio C Hamano
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Elijah Newren
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Johannes Schindelin
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Johannes Schindelin
- Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
  - From: Junio C Hamano

Prev by Date: Re: [PATCH] commit-tree: add missing --gpg-sign flag
Next by Date: Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
Previous by thread: Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
Next by thread: Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
Index(es):
- Date
- Thread

[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]