Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> >> @@ -2956,28 +2991,76 @@ static int do_merge(struct commit *commit, const
> >> char *arg, int arg_len,
> >> + cmd.git_cmd = 1;
> >> + argv_array_push(, "merge");
> >> +
Hi Eric,
On Wed, 11 Jul 2018, Eric Sunshine wrote:
> On Wed, Jul 11, 2018 at 8:38 AM Johannes Schindelin via GitGitGadget
> wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > @@ -2932,7 +2966,8 @@ static int do_merge(struct commit *commit, const char
> > *arg, int arg_len,
> > -
Eric Sunshine writes:
>> diff --git a/sequencer.c b/sequencer.c
>> @@ -2932,7 +2966,8 @@ static int do_merge(struct commit *commit, const char
>> *arg, int arg_len,
>> - strbuf_addf(, "Merge branch '%.*s'",
>> + strbuf_addf(, "Merge %s '%.*s'",
>> +
On Wed, Jul 11, 2018 at 8:38 AM Johannes Schindelin via GitGitGadget
wrote:
> Previously, we introduced the `merge` command for use in todo lists,
> to allow to recreate and modify branch topology.
>
> For ease of implementation, and to make review easier, the initial
> implementation only
From: Johannes Schindelin
Previously, we introduced the `merge` command for use in todo lists,
to allow to recreate and modify branch topology.
For ease of implementation, and to make review easier, the initial
implementation only supported merge commits with exactly two parents.
This patch
5 matches
Mail list logo
