From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 0/3] Accommodate for pu having been renamed to seen
Date: Wed, 24 Jun 2020 08:38:01 -0700 [thread overview]
Message-ID: <xmqqtuz08ofa.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.668.v2.git.1593010120.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 24 Jun 2020 14:48:37 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> Changes since v1:
>
> * Rebased onto master (no conflicts, so it is safe, and it is more robust
> than basing the patches on seen which already contains v1 of these
> patches).
Thanks, I actually wanted to include it in 'maint', so I'll queue on
the same base (no conflicts, so it is safe, and it will be in a
maintenance release if we are going to issue one).
> * Adjusted the quoting to match
> https://lore.kernel.org/git/e250f1bb100aca94c914f1b2d38a3849c2566aea.1592909867.git.liu.denton@gmail.com/
I know I mentioned it and I think the patch to SubmittingPatches
does improve by doing `seen` because it matches the way how the
nearby `git pull --rebase` is quoted.
But I am not sure about the patch to gitworkflows.txt, where the
text around the new `seen` mention 'master' and 'next'. I think
your v1 was more (locally) consistent.
I am on the fence to the change to giteveryday.txt, where `pu` got
changed to `seen`; your v1 had "(patches seen by the maintainer)" as
an explanation after the `seen`. I guess it is inconsistent to
explain only why `seen` is `seen` without doing the same for `next`,
so I would say v2 is an improvement over v1.
In short,
> 1: dc6f971290 ! 1: 35e3dafd6a docs: adjust for the recent rename of `pu` to `seen`
> @@ Documentation/SubmittingPatches: their trees themselves.
> patches, and will let you know. This works only if you rebase on top
> of the branch in which your patch has been merged (i.e. it will not
> - tell you if your patch is merged in pu if you rebase on top of
> -+ tell you if your patch is merged in 'seen' if you rebase on top of
> ++ tell you if your patch is merged in `seen` if you rebase on top of
> master).
Good.
> * Read the Git mailing list, the maintainer regularly posts messages
> @@ Documentation/giteveryday.txt: $ git push --follow-tags ko <13>
> <2> see which branches haven't been merged into `master` yet.
> Likewise for any other integration branches e.g. `maint`, `next`
> -and `pu` (potential updates).
> -+and `seen` (patches seen by the maintainer).
> ++and `seen`.
Probably good.
> <3> read mails, save ones that are applicable, and save others
> that are not quite ready (other mail readers are available).
> <4> apply them, interactively, with your sign-offs.
> @@ Documentation/gitworkflows.txt: As a given feature goes from experimental to sta
> -* 'pu' (proposed updates) is an integration branch for things that are
> - not quite ready for inclusion yet (see "Integration Branches"
> - below).
> -+* 'seen' (patches seen by the maintainer) is an integration branch for
> ++* `seen` (patches seen by the maintainer) is an integration branch for
Not---'seen' was more consistent relative to the surrounding text.
Thanks.
next prev parent reply other threads:[~2020-06-24 15:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 15:04 [PATCH 0/3] Accommodate for pu having been renamed to seen Johannes Schindelin via GitGitGadget
2020-06-23 15:04 ` [PATCH 1/3] docs: adjust for the recent rename of `pu` to `seen` Johannes Schindelin via GitGitGadget
2020-06-23 15:31 ` Đoàn Trần Công Danh
2020-06-23 19:31 ` Junio C Hamano
2020-06-23 21:32 ` Johannes Schindelin
2020-06-24 0:46 ` Đoàn Trần Công Danh
2020-06-23 15:04 ` [PATCH 2/3] docs: adjust the technical overview for the rename `pu` -> `seen` Johannes Schindelin via GitGitGadget
2020-06-23 15:04 ` [PATCH 3/3] tests: reference `seen` wherever `pu` was referenced Johannes Schindelin via GitGitGadget
2020-06-24 14:48 ` [PATCH v2 0/3] Accommodate for pu having been renamed to seen Johannes Schindelin via GitGitGadget
2020-06-24 14:48 ` [PATCH v2 1/3] docs: adjust for the recent rename of `pu` to `seen` Johannes Schindelin via GitGitGadget
2020-06-24 15:07 ` Denton Liu
2020-06-24 14:48 ` [PATCH v2 2/3] docs: adjust the technical overview for the rename `pu` -> `seen` Johannes Schindelin via GitGitGadget
2020-06-24 14:48 ` [PATCH v2 3/3] tests: reference `seen` wherever `pu` was referenced Johannes Schindelin via GitGitGadget
2020-06-24 15:24 ` [PATCH v2 0/3] Accommodate for pu having been renamed to seen Denton Liu
2020-06-24 15:42 ` Junio C Hamano
2020-06-29 13:40 ` Johannes Schindelin
2020-06-24 15:38 ` Junio C Hamano [this message]
2020-06-24 17:05 ` Junio C Hamano
2020-06-24 17:24 ` Denton Liu
2020-06-24 17:38 ` Junio C Hamano
2020-06-29 14:05 ` Johannes Schindelin
2020-06-25 12:18 ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2020-06-25 12:18 ` [PATCH v3 1/3] docs: adjust for the recent rename of `pu` to `seen` Johannes Schindelin via GitGitGadget
2020-06-25 12:18 ` [PATCH v3 2/3] docs: adjust the technical overview for the rename `pu` -> `seen` Johannes Schindelin via GitGitGadget
2020-06-25 12:18 ` [PATCH v3 3/3] tests: reference `seen` wherever `pu` was referenced Johannes Schindelin via GitGitGadget
2020-06-25 16:22 ` [PATCH v3 0/3] Accommodate for pu having been renamed to seen Junio C Hamano
2020-06-29 14:07 ` Johannes Schindelin
2020-06-30 16:03 ` Junio C Hamano
2020-07-01 10:42 ` Johannes Schindelin
2020-06-26 9:06 ` Update ProGit for pu -> seen change? (was Re: [PATCH v3 0/3] Accommodate for pu having been renamed to seen) Kaartic Sivaraam
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=xmqqtuz08ofa.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--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.
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).