From: Jonathan Corbet <corbet@lwn.net>
To: "Theodore Ts'o" <tytso@mit.edu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-doc@vger.kernel.org
Subject: Re: [PATCH RFC] Rough draft document on merging and rebasing
Date: Tue, 4 Jun 2019 13:08:37 -0600 [thread overview]
Message-ID: <20190604130837.24ea1d7b@lwn.net> (raw)
In-Reply-To: <20190601154248.GA17800@mit.edu>
On Sat, 1 Jun 2019 11:42:48 -0400
"Theodore Ts'o" <tytso@mit.edu> wrote:
> Finally, I'm bit concerned about anything which states absolutes,
> because there are people who tend to be real stickler for the rules,
> and if they see something stated in absolute terms, they fail to
> understand that there are exceptions that are well understood, and in
> use for years before the existence of the document which is trying to
> codify best practices.
Hence the "there are exceptions" text at the bottom of the document :)
Anyway, I'll rework it to try to take your comments into account. Maybe
we should consistently say "rebasing" for changing the parent commit of a
patch set, and "history modification" for the other tricks...?
Thanks for taking a look,
jon
next prev parent reply other threads:[~2019-06-04 19:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 19:53 [PATCH RFC] Rough draft document on merging and rebasing Jonathan Corbet
2019-05-31 0:45 ` Randy Dunlap
2019-05-31 23:36 ` Jonathan Corbet
2019-05-31 23:52 ` Randy Dunlap
2019-05-31 19:49 ` Linus Torvalds
2019-05-31 21:14 ` David Rientjes
2019-06-01 15:42 ` Theodore Ts'o
2019-06-04 19:08 ` Jonathan Corbet [this message]
2019-06-04 19:32 ` Geert Uytterhoeven
2019-06-04 20:43 ` Theodore Ts'o
2019-06-04 10:29 ` Geert Uytterhoeven
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=20190604130837.24ea1d7b@lwn.net \
--to=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
/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).