From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Jonathan Corbet <corbet@lwn.net>, linux-doc@vger.kernel.org
Cc: Linus Torvalds <torvalds@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs: Add a document on how to fix a messy diffstat
Date: Sun, 27 Mar 2022 13:16:38 +0700 [thread overview]
Message-ID: <bd8eb95a-1af7-1925-d3f2-0baa91b55526@gmail.com> (raw)
In-Reply-To: <87wnghd78t.fsf@meer.lwn.net>
On 26/03/22 04.58, Jonathan Corbet wrote:
> +So what is to be done? The best response when confronted with this
> +situation is to indeed to a merge, but to do it privately, as if it were
> +the source of shame. Create a new, throwaway branch and do the merge
> +there::
> +
> + ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
> + | | |
> + | +-- c1 --- c2 --- ... --- cN |
> + | / | |
> + +-- x1 --- x2 --- x3 +------------+-- TEMP
> +
A merge from the mainline, right? Or merge from what?
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2022-03-27 6:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 21:58 [PATCH] docs: Add a document on how to fix a messy diffstat Jonathan Corbet
2022-03-26 20:03 ` Linus Torvalds
2022-03-27 6:16 ` Bagas Sanjaya [this message]
2022-03-28 1:30 ` Akira Yokosawa
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd8eb95a-1af7-1925-d3f2-0baa91b55526@gmail.com \
--to=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linuxfoundation.org \
/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.
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 NNTP newsgroup(s).