Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Wed, Jan 31, 2018 at 5:48 AM, Johannes Schindelin wrote: > Hi Jake & Phillip, > > On Mon, 29 Jan 2018, Johannes Schindelin wrote: > >> On Sat, 20 Jan 2018, Jacob Keller wrote: >> >> > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood >> >

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On 31/01/18 13:48, Johannes Schindelin wrote: > Hi Jake & Phillip, > > On Mon, 29 Jan 2018, Johannes Schindelin wrote: > >> On Sat, 20 Jan 2018, Jacob Keller wrote: >> >>> On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood >>> wrote: On 18/01/18 15:35, Johannes

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Hi Jake & Phillip, On Mon, 29 Jan 2018, Johannes Schindelin wrote: > On Sat, 20 Jan 2018, Jacob Keller wrote: > > > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood > > wrote: > > > On 18/01/18 15:35, Johannes Schindelin wrote: > > >> > > >> This patch adds the `merge`

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Hi Junio, On Mon, 22 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > end_of_object_name = (char *) bol + strcspn(bol, " \t\n"); > > + item->arg = end_of_object_name + strspn(end_of_object_name, " \t"); > > + item->arg_len = (int)(eol -

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Hi Jake & Phillip, On Sat, 20 Jan 2018, Jacob Keller wrote: > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood > wrote: > > On 18/01/18 15:35, Johannes Schindelin wrote: > >> > >> This patch is part of the effort to reimplement `--preserve-merges` with > >> a

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Johannes Schindelin writes: > end_of_object_name = (char *) bol + strcspn(bol, " \t\n"); > + item->arg = end_of_object_name + strspn(end_of_object_name, " \t"); > + item->arg_len = (int)(eol - item->arg); > + > saved = *end_of_object_name; > +

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood wrote: > On 18/01/18 15:35, 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

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On 18/01/18 15:35, 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

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin wrote: > [...] > Note: this patch only adds support for recursive merges, to keep things > simple. Support for octopus merges will be added later in this patch > series, support for merges using strategies other

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 1:22 PM, Johannes Schindelin wrote: >> Would it be possible to open the editor with the supplied text when >> there's no commit? The text after must be oneline only.. > > I actually want to avoid that because my main use case is

Re: [PATCH 2/8] sequencer: introduce the `merge` command

Hi Jake, On Thu, 18 Jan 2018, Jacob Keller wrote: > On Thu, Jan 18, 2018 at 7:35 AM, 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 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 7:35 AM, 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