Hi Junio
On 13/06/2024 01:30, Junio C Hamano wrote:
* pw/rebase-i-error-message (2024-05-30) 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@xxxxxxxxx>
source: <pull.1672.v3.git.1717076630.gitgitgadget@xxxxxxxxx>
I think this comment is out of date. c.f. <xmqq7cfbp6pb.fsf@gitster.g>
where you said
Thanks, will replace. Let's see if we see comments from
others and then mark it for 'next' soonish.
It has been a while and no one has commented so maybe it is time to
merge this to 'next'?
Thanks
Phillip
