Re: [PATCH v5 00/12] In-core git merge-tree ("Server side merges")

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 21, 2022, 09:16 UTC
Message-ID: <nycvar.QRO.7.76.6.2202211015360.26495@tvgsbejvaqbjf.bet>
In-Reply-To: <220220.86k0dpd8c8.gmgdl@evledraar.gmail.com>

Hi,

On Sun, 20 Feb 2022, Ævar Arnfjörð Bjarmason wrote:

Show 12 quoted lines

> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
> index 306149fa0e2..723b1995426 100644
> --- a/Documentation/git-merge-tree.txt
> +++ b/Documentation/git-merge-tree.txt
> @@ -9,17 +9,24 @@ git-merge-tree - Perform merge without touching index or working tree
>  SYNOPSIS
>  --------
>  [verse]
> -'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>
> -'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)
> +'git merge-tree' --write-tree [<options>] <branch1> <branch2>
> +'git merge-tree' --trivial-merge <base-tree> <branch1> <branch2>

Given that we want to get away from `--trivial-merge` (and probably even deprecating and then dropping it), this direction makes no sense.

Ciao, Johannes