Re: [PATCH 1/3] rebase.c: state preserve-merges has been removed

From: Junio C Hamano <gitster@pobox.com>
Date: May 26, 2022, 23:23 UTC
Message-ID: <xmqqmtf3x4hk.fsf@gitster.g>
In-Reply-To: <32e5088b-35a1-4e8c-098e-18c465a0a0bb@web.de>

René Scharfe <l.s.r@web.de> writes:

Show 12 quoted lines

> Am 26.05.22 um 22:33 schrieb Junio C Hamano:
>> René Scharfe <l.s.r@web.de> writes:
>>
>>>>>  		OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
>>>>> -			      N_("(DEPRECATED) try to recreate merges instead of "
>>>>> +			      N_("(REMOVED) try to recreate merges instead of "
>>>>>  				 "ignoring them"),
>>>>>  			      1, PARSE_OPT_HIDDEN),
>>>>>  		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> ...
> Perhaps a better option help text would be something like "no longer
> supported, consider using --rebase-merges instead"?

Yeah, that would read very well.

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.