{"thread":{"id":"61430","subject":"[PATCH] Documentation/git-merge-tree.txt: document -X","startedAt":"2024-05-07T21:36:33Z","lastAt":"2024-05-07T22:36:01Z","messageCount":2,"participants":["Victoria Dye via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"494288","messageId":"pull.1728.git.1715117789985.gitgitgadget@gmail.com","threadId":"61430","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge-tree.txt: document -X","fromName":"Victoria Dye via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-05-07T21:36:29Z","receivedAt":"2024-05-07T21:36:33Z","isPatch":true,"sender":{"key":"vdye@github.com","avatar":"https://avatars.githubusercontent.com/u/3619353?v=4"},"body":"From: Victoria Dye <vdye@github.com>\n\nAdd an entry in the 'merge-tree' builtin documentation for\n-X/--strategy-option (added in 6a4c9e7b32 (merge-tree: add -X strategy\noption, 2023-09-24)). The same option is documented for 'merge', 'rebase',\n'revert', etc. in their respective Documentation/ files, so let's do the\nsame for 'merge-tree'.\n\nSigned-off-by: Victoria Dye <vdye@github.com>\n---\n    Documentation/git-merge-tree.txt: document -X\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1728%2Fvdye%2Fvdye%2Fmerge-tree-strategy-option-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1728/vdye/vdye/merge-tree-strategy-option-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1728\n\n Documentation/git-merge-tree.txt | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\nindex dd388fa21d5..84cb2edf6d0 100644\n--- a/Documentation/git-merge-tree.txt\n+++ b/Documentation/git-merge-tree.txt\n@@ -72,6 +72,11 @@ OPTIONS\n As the merge-base is provided directly, <branch1> and <branch2> do not need\n to specify commits; trees are enough.\n \n+-X<option>::\n+--strategy-option=<option>::\n+\tPass the merge strategy-specific option through to the merge strategy.\n+\tSee linkgit:git-merge[1] for details.\n+\n [[OUTPUT]]\n OUTPUT\n ------\n\nbase-commit: d4cc1ec35f3bcce816b69986ca41943f6ce21377\n-- \ngitgitgadget\n"},{"id":"494290","messageId":"xmqqh6f9ntbo.fsf@gitster.g","threadId":"61430","inReplyTo":"pull.1728.git.1715117789985.gitgitgadget@gmail.com","subject":"Re: [PATCH] Documentation/git-merge-tree.txt: document -X","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-05-07T22:35:55Z","receivedAt":"2024-05-07T22:36:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Victoria Dye via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Victoria Dye <vdye@github.com>\n>\n> Add an entry in the 'merge-tree' builtin documentation for\n> -X/--strategy-option (added in 6a4c9e7b32 (merge-tree: add -X strategy\n> option, 2023-09-24)). The same option is documented for 'merge', 'rebase',\n> 'revert', etc. in their respective Documentation/ files, so let's do the\n> same for 'merge-tree'.\n>\n> Signed-off-by: Victoria Dye <vdye@github.com>\n> ---\n>     Documentation/git-merge-tree.txt: document -X\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1728%2Fvdye%2Fvdye%2Fmerge-tree-strategy-option-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1728/vdye/vdye/merge-tree-strategy-option-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1728\n>\n>  Documentation/git-merge-tree.txt | 5 +++++\n>  1 file changed, 5 insertions(+)\n\nMakes sense.\n\nI briefly wondered if it is a good occasion to consolidate the four\ncopies of the document pieces into one before you add the fifth one,\nbut the one for \"git rebase -X\" is significantly different from\nothers, so perhaps we need to live with these duplications for now.\nThe ones in git-cherry-pick.txt, git-revert.txt, merge-options.txt\nand this new one can be consolidated into a single include::, but\nthen it becomes dubious if we want a new file only to hold just five\nlines, so ...\n\nWill queue.  Thanks.\n\n> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\n> index dd388fa21d5..84cb2edf6d0 100644\n> --- a/Documentation/git-merge-tree.txt\n> +++ b/Documentation/git-merge-tree.txt\n> @@ -72,6 +72,11 @@ OPTIONS\n>  As the merge-base is provided directly, <branch1> and <branch2> do not need\n>  to specify commits; trees are enough.\n>  \n> +-X<option>::\n> +--strategy-option=<option>::\n> +\tPass the merge strategy-specific option through to the merge strategy.\n> +\tSee linkgit:git-merge[1] for details.\n> +\n>  [[OUTPUT]]\n>  OUTPUT\n>  ------\n>\n> base-commit: d4cc1ec35f3bcce816b69986ca41943f6ce21377\n"}]}