kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Kyle Zhao 2022-11-24 03:37:06 +00:00 committed by Junio C Hamano
parent 501e3bab99
commit 4cc9eb338d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge-tree.txt
View 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