Johannes Schindelin writes:
>> > +static int option_read_message(struct parse_opt_ctx_t *ctx,
>> > + const struct option *opt, int unset)
>> > +{
>> > + struct strbuf *buf = opt->value;
>> > + const char *arg;
>> > +
>> > + if (unset)
>> > + BUG("-F cannot be
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/builtin/merge.c b/builtin/merge.c
> > index 4a4c09496..b0e907751 100644
> > --- a/builtin/merge.c
> > +++ b/builtin/merge.c
> > @@ -111,6 +111,35 @@ static int
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> This is consistent with `git commit` which, like `git merge`, supports
> passing the commit message via `-m ` and, unlike `git merge` before
> this patch, via `-F `.
>
> It is useful to allow this for scripted use,
From: Johannes Schindelin
This is consistent with `git commit` which, like `git merge`, supports
passing the commit message via `-m ` and, unlike `git merge` before
this patch, via `-F `.
It is useful to allow this for scripted use, or for the upcoming patch
to allow (re-)creating octopus
4 matches
Mail list logo
