From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Aug 2021, #03; Fri, 6)
Date: Mon, 09 Aug 2021 08:27:34 -0700 [thread overview]
Message-ID: <xmqqa6lqhc49.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BGSB5K636sgfGwpaHeFUyGGnGcVVBHLg96m-Jf=gajmSg@mail.gmail.com> (Elijah Newren's message of "Sat, 7 Aug 2021 09:53:04 -0600")
Elijah Newren <newren@gmail.com> writes:
> On Fri, Aug 6, 2021 at 6:26 PM Junio C Hamano <gitster@pobox.com> wrote:
>> * en/merge-strategy-docs (2021-08-05) 10 commits
>> - Update error message and code comment
>> - merge-strategies.txt: add coverage of the `ort` merge strategy
>> - git-rebase.txt: correct out-of-date and misleading text about renames
>> - merge-strategies.txt: fix simple capitalization error
>> - merge-strategies.txt: avoid giving special preference to patience algorithm
>> - merge-strategies.txt: do not imply using copy detection is desired
>> - merge-strategies.txt: update wording for the resolve strategy
>> - Documentation: edit awkward references to `git merge-recursive`
>> - directory-rename-detection.txt: small updates due to merge-ort optimizations
>> - git-rebase.txt: correct antiquated claims about --rebase-merges
>> (this branch is used by en/ort-becomes-the-default.)
>>
>> Documentation updates.
>>
>> Expecting a (hopefully final) reroll.
>
> I'm not sure what you're expecting in another reroll. No one has
> commented on my v3 suggesting any issues and I'm not aware of any
> remaining things to fix or include.
Quite honestly, I do not know where that "expecting" came from X-<.
It would have applied to the original one, but I think v3 (which is
queued here) should be as ready as it could be.
next prev parent reply other threads:[~2021-08-09 15:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 0:17 What's cooking in git.git (Aug 2021, #03; Fri, 6) Junio C Hamano
2021-08-07 15:53 ` Elijah Newren
2021-08-09 15:27 ` Junio C Hamano [this message]
2021-08-07 16:29 ` Elijah Newren
2021-08-09 17:17 ` Junio C Hamano
2021-08-09 18:39 ` Elijah Newren
2021-08-09 18:42 ` Jeff King
2021-08-10 22:38 ` Jonathan Tan
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=xmqqa6lqhc49.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.