зеркало из https://github.com/microsoft/git.git
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:
Родитель
501e3bab99
Коммит
4cc9eb338d
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче