git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Doc: reference 'seen' instead of 'pu' in meta docs
Date: Tue, 23 Jun 2020 15:51:57 -0700	[thread overview]
Message-ID: <xmqqbll9bdki.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200623152207.GA2027104@generichostname> (Denton Liu's message of "Tue, 23 Jun 2020 11:22:07 -0400")

Denton Liu <liu.denton@gmail.com> writes:

> Hi Dscho,
>
> On Tue, Jun 23, 2020 at 05:09:12PM +0200, Johannes Schindelin wrote:
>> Hi Denton,
>> 
>> On Tue, 23 Jun 2020, Denton Liu wrote:
>> 
>> > As of 2020-06-22, the name of git.git's integration branch has been
>> > renamed from 'pu' to 'seen'.[0] Update git.git-specific documentation to
>> > refer to the new branch name. In particular, update documents that refer
>> > to the workflow and also "how to contribute"-type docs.
>> >
>> > There still remains other uses of 'pu' in the docs. In these cases, it
>> > is generally used as an example and there isn't much value in updating
>> > these examples since they aren't git.git specific.
>> >
>> > [0]: https://lore.kernel.org/git/xmqqimfid2l1.fsf@gitster.c.googlers.com/
>> 
>> Whoops, I only saw this now. In the meantime I submitted what I hope is a
>> more complete version of this patch.
>
>  No worries. I was on the fence about changing any non-meta
>  documentation but, after reading your justification for the patches, it
>  makes sense to me. Let's supersede my version with yours. 
>
>  -Denton

The differences are quite small and there are only three differences
to the paths touched by this patch vs Dscho's.  Two of them are
"(patches seen by ...)" that explains what `seen` is, which is a
good reason to keep Dscho's version.

The change to Documentation/SubmittingPatches in your version quotes
`seen` better that matches how `git pull --rebase` nearby is quoted,
which Dscho may want to mimick in his version, though.

Thanks, both.

      reply	other threads:[~2020-06-23 22:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-23 10:58 [PATCH] Doc: reference 'seen' instead of 'pu' in meta docs Denton Liu
2020-06-23 15:09 ` Johannes Schindelin
2020-06-23 15:22   ` Denton Liu
2020-06-23 22:51     ` Junio C Hamano [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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqbll9bdki.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=liu.denton@gmail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).