From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Alan Mackenzie <acm@muc.de>
Subject: Re: [PATCH v2] docs: rephrase and clarify the git status --short format
Date: Sat, 16 Jan 2021 21:45:05 +0000 [thread overview]
Message-ID: <YANeYQ3ZLGtAsQqa@camp.crustytoothpaste.net> (raw)
In-Reply-To: <xmqqr1mr6x71.fsf@gitster.c.googlers.com>
[-- Attachment #1: Type: text/plain, Size: 1762 bytes --]
On 2021-01-11 at 20:22:10, Junio C Hamano wrote:
> "brian m. carlson" <sandals@crustytoothpaste.net> 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
prev parent reply other threads:[~2021-01-16 21:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 19:14 Difficulties of scripting git Alan Mackenzie
2021-01-09 21:42 ` brian m. carlson
2021-01-09 22:06 ` [PATCH] docs: add description of status output table brian m. carlson
2021-01-10 1:41 ` Junio C Hamano
2021-01-10 1:58 ` brian m. carlson
2021-01-10 12:28 ` Alan Mackenzie
2021-01-10 18:32 ` brian m. carlson
2021-01-10 19:04 ` [PATCH v2] docs: rephrase and clarify the git status --short format brian m. carlson
2021-01-11 20:22 ` Junio C Hamano
2021-01-16 21:45 ` brian m. carlson [this message]
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=YANeYQ3ZLGtAsQqa@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=acm@muc.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.