Kacper Kornet <drae...@pld-linux.org> writes:

> +--transpose-parents::
> +     Transpose the parents in the final commit. The change is made
> +     just before the commit so the meaning of 'our' and 'their'
> +     concepts remains the same (i.e. 'our' means current branch before
> +     the merge).
> +

How does this interact with Octopus merges?

> diff --git a/builtin/commit.c b/builtin/commit.c
> index ee0e884..ab2b844 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1477,6 +1477,7 @@ int cmd_commit(int argc, const char **argv, const char 
> *prefix)
>       } else if (whence == FROM_MERGE) {
>               struct strbuf m = STRBUF_INIT;
>               FILE *fp;
> +             int reversed_order=0;

Style. s/=/ = /;

> +     OPT_BOOLEAN(0, "transpose-parents", &reversed_order, N_("reverse order 
> of parents")

It smells more like "--reverse-parents" (if you deal only with
two-head merges), no?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to