Re: [PATCH v2] Add a document on rebasing and merging

2019-06-06 Thread Jani Nikula
On Tue, 04 Jun 2019, Jonathan Corbet wrote: > Every merge window seems to involve at least one episode where subsystem > maintainers don't manage their trees as Linus would like. Document the > expectations so that at least he has something to point people to. Good stuff. Some notes inline. BR,

Re: [PATCH v2] Add a document on rebasing and merging

2019-06-05 Thread Jonathan Corbet
On Tue, 4 Jun 2019 21:54:56 -0400 "Theodore Ts'o" wrote: > FYI, it looks like your patch somehow got hit by your text editor (or > MUA's) line wrapping... Weird, I haven't had a problem like that in decades. No idea what happened here... > > + > > + - Realize that the rebasing a patch series c

Re: [PATCH v2] Add a document on rebasing and merging

2019-06-04 Thread Theodore Ts'o
On Tue, Jun 04, 2019 at 01:48:35PM -0600, Jonathan Corbet wrote: > + > +Maintaining a subsystem, as a general rule, requires a familiarity with > the +Git source-code management system. Git is a powerful tool with a lot > of +features; as is often the case with such tools, there are right and > wr