Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: "Johannes Schindelin" <johannes.schinde...@gmx.de> On Mon, 23 Apr 2018, Philip Oakley wrote: From: "Johannes Schindelin" <johannes.schinde...@gmx.de> : Monday, April 23, 2018 1:03 PM Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` c

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Martin, On Tue, 24 Apr 2018, Martin Ågren wrote: > On 23 April 2018 at 17:54, Phillip Wood wrote: > > I'm fine with leaving it, I've might get round to doing a small series to > > clean things up slightly in a few weeks. At the moment > >

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Philip, On Mon, 23 Apr 2018, Philip Oakley wrote: > From: "Johannes Schindelin" <johannes.schinde...@gmx.de> : Monday, April 23, > 2018 1:03 PM > Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` command > > [...] > > > > > > labe

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Phillip, On 23 April 2018 at 17:54, Phillip Wood wrote: > I'm fine with leaving it, I've might get round to doing a small series to > clean things up slightly in a few weeks. At the moment > setup_unpack_trees_porcelain() leaks memory as it is called for each merge

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: "Johannes Schindelin" <johannes.schinde...@gmx.de> : Monday, April 23, 2018 1:03 PM Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` command Hi Philip, [...] > label onto > > # Branch abc > reset onto Is this reset strictly necessary

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

On 23/04/18 13:20, Johannes Schindelin wrote: Hi Phillip, On Sat, 21 Apr 2018, Phillip Wood wrote: On 21/04/18 11:33, Johannes Schindelin wrote: This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Phillip, On Sun, 22 Apr 2018, Phillip Wood wrote: > On 21/04/18 16:56, Phillip Wood wrote: > > On 21/04/18 11:33, Johannes Schindelin wrote: > >> This patch is part of the effort to reimplement `--preserve-merges` with > >> a substantially improved design, a design that has been developed in

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Phillip, On Sat, 21 Apr 2018, Phillip Wood wrote: > On 21/04/18 11:33, Johannes Schindelin wrote: > > This patch is part of the effort to reimplement `--preserve-merges` with > > a substantially improved design, a design that has been developed in the > > Git for Windows project to maintain

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

Hi Philip, On Sun, 22 Apr 2018, Philip Oakley wrote: > From: "Johannes Schindelin" > > This patch is part of the effort to reimplement `--preserve-merges` with > > a substantially improved design, a design that has been developed in the > > Git for Windows project to

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

On 21/04/18 16:56, Phillip Wood wrote: > On 21/04/18 11:33, Johannes Schindelin wrote: >> This patch is part of the effort to reimplement `--preserve-merges` with >> a substantially improved design, a design that has been developed in the >> Git for Windows project to maintain the dozens of

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: "Johannes Schindelin" This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

From: "Johannes Schindelin" This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of

Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

On 21/04/18 11:33, Johannes Schindelin wrote: This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of upstream Git.

[PATCH v8 06/16] sequencer: introduce the `merge` command

This patch is part of the effort to reimplement `--preserve-merges` with a substantially improved design, a design that has been developed in the Git for Windows project to maintain the dozens of Windows-specific patch series on top of upstream Git. The previous patch implemented the `label` and