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

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Apr 22, 2023, 21:53 UTC
Message-ID: <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
In-Reply-To: <CABPp-BGPbo8B6JXBOHTQs0LegpwHccbnnGe__ea05fkO_34YKA@mail.gmail.com>

Hi Junio and Elijah,

Le 2023-04-22 à 11:00, Elijah Newren a écrit :

Show 23 quoted lines

> On Thu, Apr 20, 2023 at 3:57 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> * 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?

Yes, sorry for not having send a v2 yet (or responding to reviews), I'm very busy with work.

I'm also surprised that this is already in 'next' since your "What's cooking" of the 17th did not mention "will merge to next" for this branch [1].

I've fixed the typos and also would like to incorporate Victoria's suggestion.

I probably won't have time to do this before May though. I'll send a v2 then. I can do fixup patches on top if it stays in next, or I can wait till next is rebuilt... whatever works best.

Cheers, Philippe.

[1] https://lore.kernel.org/git/xmqqfs8xfw25.fsf@gitster.g/