Hi Junio, On Wed, 11 Jul 2018, Junio C Hamano wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> 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
