From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH] CoC: update to 2.0
Date: Mon, 28 Dec 2020 14:43:36 -0800 [thread overview]
Message-ID: <xmqqv9cleelj.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <87lfdhvnto.fsf@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Mon, 28 Dec 2020 18:32:19 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> I think the update to 2.0 makes sense. But would in general prefer less
> divergence with upstream for code or documents we copy/paste.
>
> So I submitted a v2 in
> https://lore.kernel.org/git/20201228171734.30038-1-avarab@gmail.com/
> whose diff to upstream is half the size of yours. Perhaps you like it
> better, or not.
I _think_ most of the divergence comes from the fact that I copied
from a wrong variant. I somehow picked asciidoc variant and
manually adjusted the section leaders, and I wouldn't be surprised
if it wraps lines differently from their markdown variant.
As I expect to be mostly offline this week, I'll let your series sit
on the list while it collects Acks just like we did for the version
1.4, but in any case, let's go with your variant that is based on
the official markdown version supplied by the upstream.
Thanks.
next prev parent reply other threads:[~2020-12-28 23:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 12:59 [PATCH] CoC: update to 2.0 Junio C Hamano
2020-12-28 15:18 ` Derrick Stolee
2020-12-28 17:02 ` brian m. carlson
2020-12-28 17:17 ` [PATCH v2 0/2] CoC: update to 2.0 with less upstream divergence Ævar Arnfjörð Bjarmason
2020-12-28 17:17 ` [PATCH v2 1/2] CoC: Update word-wrapping to match upstream Ævar Arnfjörð Bjarmason
2020-12-29 3:11 ` Jonathan Nieder
2021-01-04 23:43 ` Junio C Hamano
2020-12-28 17:17 ` [PATCH v2 2/2] CoC: update to version 2.0 + local changes Ævar Arnfjörð Bjarmason
2020-12-28 22:58 ` Junio C Hamano
2020-12-29 2:02 ` Elijah Newren
2020-12-29 18:36 ` Derrick Stolee
2020-12-30 8:20 ` Christian Couder
2021-01-04 23:47 ` Re* " Junio C Hamano
2021-01-07 23:28 ` Johannes Schindelin
2021-01-08 0:41 ` Junio C Hamano
2021-01-08 1:57 ` brian m. carlson
2020-12-29 3:17 ` Jonathan Nieder
2020-12-28 17:32 ` [PATCH] CoC: update to 2.0 Ævar Arnfjörð Bjarmason
2020-12-28 22:43 ` Junio C Hamano [this message]
2020-12-28 18:40 ` Emily Shaffer
2020-12-29 8:54 ` Pratyush Yadav
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=xmqqv9cleelj.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).