From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, Izzy <winglovet@gmail.com>
Subject: Re: What's cooking in git.git (Oct 2023, #03; Fri, 6)
Date: Mon, 9 Oct 2023 10:59:53 +0100 [thread overview]
Message-ID: <02cf1135-d330-4f0b-aa43-4a555f34adfc@gmail.com> (raw)
In-Reply-To: <xmqqh6n24zf1.fsf@gitster.g>
On 07/10/2023 09:20, Junio C Hamano wrote:
> * ty/merge-tree-strategy-options (2023-09-25) 1 commit
> (merged to 'next' on 2023-09-29 at aa65b54416)
> + merge-tree: add -X strategy option
>
> "git merge-tree" learned to take strategy backend specific options
> via the "-X" option, like "git merge" does.
>
> Will merge to 'master'.
> source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
We may want to hold off on this as there is a wierd copy-by-value of
struct merge-options cf <a482d047-dd40-436d-8daa-0c74780af11f@gmail.com>
Best Wishes
Phillip
next prev parent reply other threads:[~2023-10-09 10:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-07 8:20 What's cooking in git.git (Oct 2023, #03; Fri, 6) Junio C Hamano
2023-10-08 17:34 ` René Scharfe
2023-10-09 16:35 ` Junio C Hamano
2023-10-28 12:02 ` René Scharfe
2023-10-09 9:59 ` Phillip Wood [this message]
2023-10-09 16:16 ` Taylor Blau
2023-10-09 18:09 ` Junio C Hamano
2023-10-09 18:13 ` Taylor Blau
2023-10-09 21:07 ` Junio C Hamano
2023-10-10 20:36 ` Taylor Blau
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=02cf1135-d330-4f0b-aa43-4a555f34adfc@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=winglovet@gmail.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 NNTP newsgroup(s).