diff mbox series

[v8,3/3] docs: fix description of the `--merge-base` option

Message ID c21466d1db0e7f7fcd7308b61aa1e3cd4e3d67c4.1669261026.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 4cc9eb338d8773b4c3909368445404745f94ce69
Headers show
Series merge-tree: allow specifying a base commit when --write-tree is passed | expand

Commit Message

Kyle Zhao Nov. 24, 2022, 3:37 a.m. UTC 
From: Kyle Zhao <kylezhao@tencent.com>

Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
---
 Documentation/git-merge-tree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Junio C Hamano Nov. 25, 2022, 5:28 a.m. UTC | #1 
"Kyle Zhao via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Kyle Zhao <kylezhao@tencent.com>
>
> Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
> ---
>  Documentation/git-merge-tree.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
> index 298c133fdb6..88ee942101a 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`.

Makes sense.  Will queue.

Thanks.
diff mbox series

Patch

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 298c133fdb6..88ee942101a 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