From: Phillip Wood <phillip.wood123@gmail.com>
Date: Wed, 15 May 2024 19:33:50 GMT
Subject: Re: What's cooking in git.git (May 2024, #06; Tue, 14)
Message-ID: <bd1c80f9-e8c5-42d6-b36b-52e40a78aeda@gmail.com>
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