On 2021-01-11 at 20:22:10, Junio C Hamano wrote: > "brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> writes: > > > This uses text from Junio's email, so his sign-off will be required > > here. I assume that won't be a problem, but I can send a v3 if it is. > > Actually I find the text so vastly improved from "here is my > attempt" version in the discussion that, other than the paragraph > structure, there is nothing left that I can call my contribution. > I'll sign the resulting commit off anyway, though ;-) Well, I did use some of your text verbatim, though, and the sign-off is necessary. Not that it's easily distinguishable in our history since you're the maintainer, but I also like to be meticulous about sign-offs because I think it makes sure that people get due credit for their contributions. > > +There are three different types of states that are shown using this format, and > > +each one uses the `XY` syntax differently: > > ... > > + > > +Note that the term _merge_ here also includes rebases using the default > > +`--merge` strategy, cherry-picks, and anything else using the merge machinery. > > Even if rebase uses the good-old "format-patch | am -3" pipeline, it > would result in an index with entries at higher stages. So I am not > sure if this "Note that" helps the reader. I'll rephrase. > > +In the following table, these three classes are shown in separate sections, and > > This iteration has improved the "Three different classes of paths > are shown" in the "here is my attempt" version to "Three different > types of states ..."; shouldn't we be doing the same here with > s/classes/types of states/? Can do. -- brian m. carlson (he/him or they/them) Houston, Texas, US
Attachment:
signature.asc
Description: PGP signature
