From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Elijah Newren <newren@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20))
Date: Sat, 22 Apr 2023 17:53:52 -0400 [thread overview]
Message-ID: <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com> (raw)
In-Reply-To: <CABPp-BGPbo8B6JXBOHTQs0LegpwHccbnnGe__ea05fkO_34YKA@mail.gmail.com>
Hi Junio and Elijah,
Le 2023-04-22 à 11:00, Elijah Newren a écrit :
> 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/
next prev parent reply other threads:[~2023-04-22 21:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 22:34 What's cooking in git.git (Apr 2023, #06; Thu, 20) Junio C Hamano
2023-04-21 2:16 ` tb/ban-strtok (was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20)) Taylor Blau
2023-04-22 11:22 ` Jeff King
2023-04-24 16:39 ` tb/ban-strtok Junio C Hamano
2023-04-22 15:00 ` pb/complete-and-document-auto-merge-and-friends (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20)) Elijah Newren
2023-04-22 21:53 ` Philippe Blain [this message]
2023-04-24 18:21 ` pb/complete-and-document-auto-merge-and-friends Junio C Hamano
2023-04-22 15:00 ` en/header-split-cache-h-part-2 (Was: Re: What's cooking in git.git (Apr 2023, #06; Thu, 20)) Elijah Newren
2023-04-24 18:20 ` en/header-split-cache-h-part-2 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=a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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 read-only IMAP folder(s) and NNTP newsgroup(s).