From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: en/merge-ort-prepare-to-remove-recursive (Was: Re: What's cooking in git.git (Mar 2025, #03; Wed, 12))
Date: Wed, 12 Mar 2025 17:08:59 -0700 [thread overview]
Message-ID: <CABPp-BGfZ=onjJnCHEAqxFwKPYWPEV_qQNfTWdx6C8FBkuSyyQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqh63xx23f.fsf@gitster.g>
On Wed, Mar 12, 2025 at 4:26 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/merge-ort-prepare-to-remove-recursive (2025-03-07) 3 commits
> - merge-ort: support having merge verbosity be set to 0
> - merge-ort: allow rename detection to be disabled
> - merge-ort: add new merge_ort_generic() function
>
> First step of deprecating and removing merge-recursive.
>
> Will merge to 'next'.
> source: <pull.1875.git.1741362522.gitgitgadget@gmail.com>
Can you hold off? Patrick and Taylor requested some changes, and I'm
about to submit v2.
next prev parent reply other threads:[~2025-03-13 0:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 23:26 What's cooking in git.git (Mar 2025, #03; Wed, 12) Junio C Hamano
2025-03-13 0:08 ` Elijah Newren [this message]
2025-03-13 23:35 ` Usman Akinyemi
2025-03-17 22:39 ` Taylor Blau
2025-03-18 10:13 ` Karthik Nayak
2025-03-18 17:17 ` Junio C Hamano
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='CABPp-BGfZ=onjJnCHEAqxFwKPYWPEV_qQNfTWdx6C8FBkuSyyQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).