From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH v2 1/1] t/lib-rebase: improve documentation of set_fake_editor()
Date: Thu, 10 Aug 2023 08:49:32 -0700 [thread overview]
Message-ID: <xmqq1qgaj3sj.fsf@gitster.g> (raw)
In-Reply-To: <a2830ab8-e938-56e8-4f28-074262c95ed8@gmail.com> (Phillip Wood's message of "Thu, 10 Aug 2023 15:37:21 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Oswald
>
> On 09/08/2023 18:15, Oswald Buddenhagen wrote:
>> Firstly, make it reflect better what actually happens. Not omitting some
>> possibilities makes it easier to fully exploit them, and not
>> contradicting the implementation makes it easier to grok and thus modify
>> the code.
>
> Thanks for expanding this first point, the new message looks fine to
> me. The code changes look good apart from one change in the that got
> missed.
>
>> -# "<lineno>" -- add a "pick" line with the SHA1 taken from the
>> -# specified line.
>> +# "<cmd>" -- override the command for the next line specification. Can be
>> +# "pick", "squash", "fixup[_-(c|C)]", "edit", "reword", "drop",
>> +# "merge[_-{c|C}_<rev>]", or "bad" for an invalid command.
>
> This is still using "{}" in the merge documentation rather than "()"
> like the new fixup docs.
>
> Thanks
Ah, thanks for sharp eyes. I can locally tweak these two bytes ;-)
next prev parent reply other threads:[~2023-08-10 15:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [PATCH] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Oswald Buddenhagen
2023-04-26 15:45 ` Oswald Buddenhagen
2023-04-26 17:24 ` Junio C Hamano
2023-05-02 16:38 ` Felipe Contreras
2023-05-17 9:23 ` Phillip Wood
2023-08-07 17:09 ` [PATCH 0/3] " Oswald Buddenhagen
2023-08-07 17:09 ` [PATCH 1/3] t/lib-rebase: set_fake_editor(): fix recognition of reset's short command Oswald Buddenhagen
2023-08-07 19:00 ` Junio C Hamano
2023-08-07 17:09 ` [PATCH 2/3] t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently Oswald Buddenhagen
2023-08-07 19:09 ` Junio C Hamano
2023-08-07 17:09 ` [PATCH 3/3] t/lib-rebase: improve documentation of set_fake_editor() Oswald Buddenhagen
2023-08-09 13:04 ` Phillip Wood
2023-08-09 17:15 ` [PATCH v2 0/1] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v2 1/1] t/lib-rebase: improve documentation of set_fake_editor() Oswald Buddenhagen
2023-08-09 19:38 ` Junio C Hamano
2023-08-10 14:37 ` Phillip Wood
2023-08-10 15:49 ` Junio C Hamano [this message]
2023-08-09 21:15 ` [PATCH v2 0/1] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Junio C Hamano
2023-08-10 10:42 ` Oswald Buddenhagen
2023-08-10 16:00 ` Junio C Hamano
2023-08-10 23:57 ` Junio C Hamano
2023-08-09 13:05 ` [PATCH 0/3] " Phillip Wood
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=xmqq1qgaj3sj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood123@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.