Re: [PATCH 2/3] rebase: help users when dying with `preserve-merges`

From: Junio C Hamano <gitster@pobox.com>
Date: May 27, 2022, 15:54 UTC
Message-ID: <xmqqzgj355uc.fsf@gitster.g>
In-Reply-To: <c7667b0b-d18c-e2e4-0a9e-45367ee8ac0e@iee.email>

Philip Oakley <philipoakley@iee.email> writes:

Show 10 quoted lines

> On 26/05/2022 21:42, Junio C Hamano wrote:
>> Philip Oakley <philipoakley@iee.email> writes:
>>
>>>>> Make the `rebase --abort` option available to allow users to remove
>>>>> traces of any preserve-merges rebase, even if they had upgraded
>>>>> during a rebase.
>> This patch does not make it "available", though.
>
> Yes it does. Sorry if the terminology or explanation was poor (here we
> are looking at the commit message, not the user facing message?).

Sorry, you're right.  I misread the new "&&" condition in the patch.

> I hope to re-roll later next week. In general it's mainly tweaks and
> finesse.

Thanks.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.