Subject: Re: [PATCH v2 2/2] merge-tree: add a new --dry-run flag

From: Junio C Hamano <[email-masked]>
Date: Tue, 13 May 2025 06:24:21 -0700

"Elijah Newren via GitGitGadget" <[email-masked]> writes:

> From: Elijah Newren <[email-masked]>
>
> Git Forges may be interested in whether two branches can be merged while
> not being interested in what the resulting merge tree is nor which files
> conflicted.  For such cases, add a new --dry-run flag which
> will make use of the new mergeability_only flag added to merge-ort in
> the previous commit.  This option allows the merge machinery to, in the

The first three lines are almost identical to [1/2] here, modulo the
internal name still being mergeability-only while the external name
is now dry-run, which is perfectly fine as long as that is done
consistently.

> diff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc
> index cf0578f9b5e8..7dcc17806191 100644
> --- a/Documentation/git-merge-tree.adoc
> +++ b/Documentation/git-merge-tree.adoc
> @@ -65,6 +65,12 @@ OPTIONS
>  	default is to include these messages if there are merge
>  	conflicts, and to omit them otherwise.
>  
> +--mergeability-only::

But is this internal or external name?

> +	Disable all output from the program.  Useful when you are only
> +	interested in the exit status.  Allows merge-tree to exit
> +	early on the first conflict it finds, and allows it to avoid
> +	writing most objects created by merges.

OK.