Re: [PATCH RFC] Rough draft document on merging and rebasing

From: Theodore Ts'o
Date: Tue Jun 04 2019 - 16:47:33 EST

On Tue, Jun 04, 2019 at 01:08:37PM -0600, Jonathan Corbet wrote:
> On Sat, 1 Jun 2019 11:42:48 -0400
> "Theodore Ts'o" <tytso@xxxxxxx> 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...?

Those names sound good to me. Thanks!!

- Ted