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>
This commit is contained in:
parent
501e3bab99
commit
4cc9eb338d
@ -66,8 +66,8 @@ OPTIONS
|
|||||||
|
|
||||||
--merge-base=<commit>::
|
--merge-base=<commit>::
|
||||||
Instead of finding the merge-bases for <branch1> and <branch2>,
|
Instead of finding the merge-bases for <branch1> and <branch2>,
|
||||||
specify a merge-base for the merge. This option is incompatible
|
specify a merge-base for the merge, and specifying multiple bases is
|
||||||
with `--stdin`.
|
currently not supported. This option is incompatible with `--stdin`.
|
||||||
|
|
||||||
[[OUTPUT]]
|
[[OUTPUT]]
|
||||||
OUTPUT
|
OUTPUT
|
||||||
|
Loading…
Reference in New Issue
Block a user