git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Aug 2021, #03; Fri, 6)

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 9, 2021, 15:27 UTC
Message-ID
<xmqqa6lqhc49.fsf@gitster.g>
In-Reply-To
<CABPp-BGSB5K636sgfGwpaHeFUyGGnGcVVBHLg96m-Jf=gajmSg@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 21 quoted lines
> 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.

Previous: Elijah NewrenNext: Elijah Newren
Message 3 of 8 in “What's cooking in git.git (Aug 2021, #03; Fri, 6)”
  1. Junio C HamanoAug 7, 2021
  2. Elijah NewrenAug 7, 2021
  3. Junio C HamanoAug 9, 2021
  4. Elijah NewrenAug 7, 2021
  5. Junio C HamanoAug 9, 2021
  6. Elijah NewrenAug 9, 2021
  7. Jeff KingAug 9, 2021
  8. Jonathan TanAug 10, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.