Skip to content

Commit 4cc9eb3

Browse files
keyu98gitster
authored andcommitted
docs: fix description of the --merge-base option
Signed-off-by: Kyle Zhao <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 501e3ba commit 4cc9eb3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-merge-tree.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ OPTIONS
6666

6767
--merge-base=<commit>::
6868
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`.
7171

7272
[[OUTPUT]]
7373
OUTPUT

0 commit comments

Comments
 (0)