From: Kyle Zhao <kylezhao@tencent.com>
Date: Thu, 24 Nov 2022 03:37:06 +0000 (+0000)
Subject: docs: fix description of the `--merge-base` option
X-Git-Tag: v2.40.0-rc0~159^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cc9eb338d8773b4c3909368445404745f94ce69;p=thirdparty%2Fgit.git

docs: fix description of the `--merge-base` option

Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 298c133fdb..88ee942101 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -66,8 +66,8 @@ OPTIONS
 
 --merge-base=<commit>::
 	Instead of finding the merge-bases for <branch1> and <branch2>,
-	specify a merge-base for the merge. This option is incompatible
-	with `--stdin`.
+	specify a merge-base for the merge, and specifying multiple bases is
+	currently not supported. This option is incompatible with `--stdin`.
 
 [[OUTPUT]]
 OUTPUT