From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Kyle Meyer <kyle@kyleam.com>, git@vger.kernel.org
Subject: Re: [PATCH] rebase docs: drop stray word in merge command description
Date: Mon, 10 Dec 2018 12:31:13 +0900 [thread overview]
Message-ID: <xmqqk1ki2h32.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1812092040320.43@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Sun, 9 Dec 2018 20:41:15 +0100 (STD)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 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.
next prev parent reply other threads:[~2018-12-10 3:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 23:15 [PATCH] rebase docs: drop stray word in merge command description Kyle Meyer
2018-12-09 19:41 ` Johannes Schindelin
2018-12-10 3:31 ` Junio C Hamano [this message]
2018-12-10 8:27 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk1ki2h32.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).