]> git.ipfire.org Git - thirdparty/git.git/commitdiff
docs: fix description of the `--merge-base` option
authorKyle Zhao <kylezhao@tencent.com>
Thu, 24 Nov 2022 03:37:06 +0000 (03:37 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Nov 2022 01:11:46 +0000 (10:11 +0900)
Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt

index 298c133fdb6965774a9021fe4d3137ac07ef3464..88ee942101a7748ac2a7b5030b364ed7e27d5fdb 100644 (file)
@@ -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