git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 10, 2018, 08:27 UTC
Message-ID
<nycvar.QRO.7.76.6.1812100927150.43@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqk1ki2h32.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Mon, 10 Dec 2018, Junio C Hamano wrote:
Show 34 quoted lines
> 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.

You are right, of course, this was not as critical a bug fix as others you integrated last minute.

Thanks, Dscho

Previous: Junio C Hamano
Message 4 of 4 in “rebase docs: drop stray word in merge command description”
  1. rebase docs: drop stray word in merge command descriptionKyle Meyer, Dec 8, 2018
  2. Johannes SchindelinDec 9, 2018
  3. Junio C HamanoDec 10, 2018
  4. Johannes SchindelinDec 10, 2018

Read the whole thread, see it on lore, or plain text.

$ 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.