Re: [PATCH v5 00/12] In-core git merge-tree ("Server side merges")
From: Johannes Schindelin <hidden>
Date: 2022-02-21 09:38:16
Hi, On Sun, 20 Feb 2022, Ævar Arnfjörð Bjarmason wrote:
quoted hunk ↗ jump to hunk
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