Re: [PATCH] rebase docs: drop stray word in merge command description

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 10, 2018, 03:31 UTC
Message-ID: <xmqqk1ki2h32.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <nycvar.QRO.7.76.6.1812092040320.43@tvgsbejvaqbjf.bet>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 10 quoted lines

> Hi Kyle,
>
> On Sat, 8 Dec 2018, Kyle Meyer wrote:
>
>> Delete a misplaced word introduced by caafecfcf1 (rebase
>> --rebase-merges: adjust man page for octopus support, 2018-03-09).
>> 
>> Signed-off-by: Kyle Meyer <kyle@kyleam.com>
>
> ACK.

Thanks.

> Too bad this did not make it into v2.20.0, but at least it can make it
> into a future version.

The right way to fix it is to prepare a topic that can be merged down to the 2.19.x track, and proceed normally to percolate it down via 'next', 'master' and 'maint' as any other fixes. That is already happening.

The original documentation bug is older than where the 2.20 track forked; the bug is in 2.19. Any such old bugs, users have survived without it being fixed for a cycle already, and the fix is not that urgent to interrupt the release engineering that is already underway and redo it.

A regression that appears only in -rc and a known bug in a new feature that appears only in -rc are different matters. It is prudent to always first access how serious they are and we must be prepared to even delay the final as necessary. But I do not think this one is.