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>
Kyle Zhao committed
Nov 24, 2022 at 03:37 UTC
4cc9eb338d8773b4c3909368445404745f94ce69
1 file changed
+2
-2
Documentation/git-merge-tree.txt
+2
-2
@@ -66,8 +66,8 @@ OPTIONS
66
67
--merge-base=<commit>::
68
Instead of finding the merge-bases for <branch1> and <branch2>,
69
- specify a merge-base for the merge. This option is incompatible
70
- with `--stdin`.
69
+ specify a merge-base for the merge, and specifying multiple bases is
70
+ currently not supported. This option is incompatible with `--stdin`.
71
72
[[OUTPUT]]
73
OUTPUT