From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (May 2024, #06; Tue, 14)
Date: Wed, 15 May 2024 20:33:50 +0100 [thread overview]
Message-ID: <bd1c80f9-e8c5-42d6-b36b-52e40a78aeda@gmail.com> (raw)
In-Reply-To: <xmqqcypo47p7.fsf@gitster.g>
Hi Junio
On 14/05/2024 18:36, Junio C Hamano wrote:
> * pw/rebase-i-error-message (2024-04-08) 2 commits
> - rebase -i: improve error message when picking merge
> - rebase -i: pass struct replay_opts to parse_insn_line()
>
> When the user adds to "git rebase -i" instruction to "pick" a merge
> commit, the error experience is not pleasant. Such an error is now
> caught earlier in the process that parses the todo list.
>
> Expecting a reroll.
> cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@gmail.com>
> source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com>
Sorry, I was hoping to re-roll this week but that's going to happen and
I'm about to go off the list for a couple of weeks. Feel free to drop
this if it causes you trouble and I'll re-roll when I'm back on the list.
Best Wishes
Phillip
next prev parent reply other threads:[~2024-05-15 19:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 17:36 What's cooking in git.git (May 2024, #06; Tue, 14) Junio C Hamano
2024-05-15 11:57 ` Christian Couder
2024-05-15 14:16 ` Junio C Hamano
2024-05-15 19:33 ` Phillip Wood [this message]
2024-05-16 16:00 ` René Scharfe
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=bd1c80f9-e8c5-42d6-b36b-52e40a78aeda@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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 NNTP newsgroup(s).