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

pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))

From
Elijah Newren <newren@gmail.com>
Date
Apr 22, 2023, 15:00 UTC
Message-ID
<CABPp-BGPbo8B6JXBOHTQs0LegpwHccbnnGe__ea05fkO_34YKA@mail.gmail.com>
In-Reply-To
<xmqqwn26w5cd.fsf@gitster.g>
On Thu, Apr 20, 2023 at 3:57 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 14 quoted lines
>
> * pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
>   (merged to 'next' on 2023-04-20 at 2728a01622)
>  + completion: complete AUTO_MERGE
>  + Documentation: document AUTO_MERGE
>  + git-merge.txt: modernize word choice in "True merge" section
>  + completion: complete REVERT_HEAD and BISECT_HEAD
>  + revisions.txt: document more special refs
>
>  Document more pseudo-refs and teach the command line completion
>  machinery to complete AUTO_MERGE.
>
>  Will merge to 'master'.
>  source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
This merged to next already?  Doh.

There was some misleading text (and a few typos) in 4/5, and good suggestions from both Eric and Victoria in the thread for wording and display improvements.

Perhaps we can at least wait for a fixup patch?
Previous: Junio C HamanoNext: Philippe Blain
Message 7 of 9 in “What's cooking in git.git (Apr 2023, #06; Thu, 20)”
  1. Junio C HamanoApr 20, 2023
  2. tb/ban-strtok (was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))Taylor Blau, Apr 21, 2023
  3. Jeff KingApr 22, 2023
  4. Junio C HamanoApr 24, 2023
  5. en/header-split-cache-h-part-2 (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))Elijah Newren, Apr 22, 2023
  6. Junio C HamanoApr 24, 2023
  7. pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))Elijah Newren, Apr 22, 2023
  8. Philippe BlainApr 22, 2023
  9. Junio C HamanoApr 24, 2023

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.