Documentation/git-merge-tree.txt: document -X

[vdye]

/submit

[gitgitgadget[bot]]

Submitted as pull.1728.git.1715117789985.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1728/vdye/vdye/merge-tree-strategy-option-v1

To fetch this version to local tag pr-1728/vdye/vdye/merge-tree-strategy-option-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1728/vdye/vdye/merge-tree-strategy-option-v1

[gitgitgadget[bot]]

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Victoria Dye <vdye@github.com>
>
> Add an entry in the 'merge-tree' builtin documentation for
> -X/--strategy-option (added in 6a4c9e7b32 (merge-tree: add -X strategy
> option, 2023-09-24)). The same option is documented for 'merge', 'rebase',
> 'revert', etc. in their respective Documentation/ files, so let's do the
> same for 'merge-tree'.
>
> Signed-off-by: Victoria Dye <vdye@github.com>
> ---
>     Documentation/git-merge-tree.txt: document -X
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1728%2Fvdye%2Fvdye%2Fmerge-tree-strategy-option-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1728/vdye/vdye/merge-tree-strategy-option-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1728
>
>  Documentation/git-merge-tree.txt | 5 +++++
>  1 file changed, 5 insertions(+)

Makes sense.

I briefly wondered if it is a good occasion to consolidate the four
copies of the document pieces into one before you add the fifth one,
but the one for "git rebase -X" is significantly different from
others, so perhaps we need to live with these duplications for now.
The ones in git-cherry-pick.txt, git-revert.txt, merge-options.txt
and this new one can be consolidated into a single include::, but
then it becomes dubious if we want a new file only to hold just five
lines, so ...

Will queue.  Thanks.

> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
> index dd388fa21d5..84cb2edf6d0 100644
> --- a/Documentation/git-merge-tree.txt
> +++ b/Documentation/git-merge-tree.txt
> @@ -72,6 +72,11 @@ OPTIONS
>  As the merge-base is provided directly, <branch1> and <branch2> do not need
>  to specify commits; trees are enough.
>  
> +-X<option>::
> +--strategy-option=<option>::
> + Pass the merge strategy-specific option through to the merge strategy.
> + See linkgit:git-merge[1] for details.
> +
>  [[OUTPUT]]
>  OUTPUT
>  ------
>
> base-commit: d4cc1ec35f3bcce816b69986ca41943f6ce21377

[gitgitgadget[bot]]

This branch is now known as vd/doc-merge-tree-x-option.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/b6209a9ea11b4b0842df0d6605dac33fe0c580f9.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/e5936cb5b7a8972fb87ce23bb0eb81da78d6e873.

[gitgitgadget[bot]]

This patch series was integrated into next via https://github.com/git/git/commit/42637b8bdf2f1c118b74dde2a92038eb2949f8ec.

[gitgitgadget[bot]]

There was a status update in the "New Topics" section about the branch vd/doc-merge-tree-x-option on the Git mailing list:

Doc update.

Will merge to 'master'.
source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/b7b4d4e300fb6722b256edaf8d0b8bc0c99c3e00.

[gitgitgadget[bot]]

There was a status update in the "Cooking" section about the branch vd/doc-merge-tree-x-option on the Git mailing list:

Doc update.

Will merge to 'master'.
source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/479297af32ad0c75adb313b0a1cd8299bb7b20a2.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/6a586dee32dadc75a8f991995a8860ce78ff2e64.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/7d6fa2015f4f4fb8248a36aff7f036fa95a81b8c.

[gitgitgadget[bot]]

There was a status update in the "Cooking" section about the branch vd/doc-merge-tree-x-option on the Git mailing list:

Doc update.

Will merge to 'master'.
source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/754ae502191e3f9980b8583280c48368ee667b2c.

[gitgitgadget[bot]]

This patch series was integrated into master via https://github.com/git/git/commit/754ae502191e3f9980b8583280c48368ee667b2c.

[gitgitgadget[bot]]

This patch series was integrated into next via https://github.com/git/git/commit/754ae502191e3f9980b8583280c48368ee667b2c.

[gitgitgadget[bot]]

Closed via 754ae502191e3f9980b8583280c48368ee667b2c.