diff options
| author | Kyle Zhao <kylezhao@tencent.com> | 2022-11-24 03:37:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-25 10:11:46 +0900 |
| commit | 4cc9eb338d8773b4c3909368445404745f94ce69 (patch) | |
| tree | 4f42cb8b493bdc6b6ab78228561d2ea166c1ca74 /Documentation/git-merge-tree.txt | |
| parent | 501e3bab99da75eada3e2d6ef5257a3c44dd1ae4 (diff) | |
| download | git-4cc9eb338d8773b4c3909368445404745f94ce69.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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 |