From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
gitgitgadget@gmail.com, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] rebase --rebase-merges: add support for octopus merges
Date: Thu, 12 Jul 2018 15:11:17 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1807121509550.75@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqfu0p1luz.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> Eric Sunshine <sunshine@sunshineco.com> 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(&cmd.args, "merge");
> >> + argv_array_push(&cmd.args, "-s");
> >> + argv_array_push(&cmd.args, "octopus");
> >
> > argv_array_pushl(&cmd.args, "-s", "octopus", NULL);
> >
> > which would make it clear that these two arguments must remain
> > together, and prevent someone from coming along and inserting a new
> > argument between them.
>
> A valid point. It is OK to break "merge" and "-s octopus" into
> separate push invocations, but not "-s" and "octopus". Or perhaps
> push it as a single "--strategy=octopus" argument, which would be
> a better approach anyway.
I had missed that in the documentation, as the synopsis does not mention
it.
Thank you!
Dscho
next prev parent reply other threads:[~2018-07-12 13:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 12:38 [PATCH 0/3] rebase -r: support octopus merges Johannes Schindelin via GitGitGadget
2017-12-21 14:52 ` [PATCH 2/3] rebase --rebase-merges: add support for " Johannes Schindelin via GitGitGadget
2018-07-11 18:49 ` Eric Sunshine
2018-07-11 21:52 ` Junio C Hamano
2018-07-12 13:11 ` Johannes Schindelin [this message]
2018-07-12 13:08 ` Johannes Schindelin
2017-12-22 14:10 ` [PATCH 1/3] merge: allow reading the merge commit message from a file Johannes Schindelin via GitGitGadget
2018-07-11 22:06 ` Junio C Hamano
2018-07-12 12:58 ` Johannes Schindelin
2018-07-12 16:20 ` Junio C Hamano
2018-03-09 16:36 ` [PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support Johannes Schindelin via GitGitGadget
2018-07-11 17:05 ` Elijah Newren
2018-07-12 12:48 ` Johannes Schindelin
2018-07-11 17:35 ` [PATCH 0/3] rebase -r: support octopus merges Junio C Hamano
2018-07-11 17:47 ` Stefan Beller
2018-07-12 12:54 ` Johannes Schindelin
2018-07-12 16:26 ` Junio C Hamano
2018-07-13 16:42 ` Johannes Sixt
2018-07-16 17:56 ` Junio C Hamano
2018-07-12 12:49 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1807121509550.75@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).