From: Junio C Hamano <gitster@pobox.com>
To: "Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Victoria Dye <vdye@github.com>
Subject: Re: [PATCH] Documentation/git-merge-tree.txt: document -X
Date: Tue, 07 May 2024 15:35:55 -0700 [thread overview]
Message-ID: <xmqqh6f9ntbo.fsf@gitster.g> (raw)
In-Reply-To: <pull.1728.git.1715117789985.gitgitgadget@gmail.com> (Victoria Dye via GitGitGadget's message of "Tue, 07 May 2024 21:36:29 +0000")
"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
prev parent reply other threads:[~2024-05-07 22:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 21:36 [PATCH] Documentation/git-merge-tree.txt: document -X Victoria Dye via GitGitGadget
2024-05-07 22:35 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh6f9ntbo.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).