git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Denton Liu <liu.denton@gmail.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 0/3] Accommodate for pu having been renamed to seen
Date: Wed, 24 Jun 2020 14:48:37 +0000	[thread overview]
Message-ID: <pull.668.v2.git.1593010120.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.668.git.1592924655.gitgitgadget@gmail.com>

This patch series adjusts Git's own source code to reflect that change.

Please note that even with these patches, there are still a couple places
where pu is used:

 * In the translations. These are legitimate words in languages that are not
   English (as in "gpg n'a pas pu signer les données" where "pu" is French
   for the English "could").
 * In upload-pack.c, where a variable named pu is short form for
   "pack-objects updates".

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).
   
   
 * Adjusted the quoting to match 
   https://lore.kernel.org/git/e250f1bb100aca94c914f1b2d38a3849c2566aea.1592909867.git.liu.denton@gmail.com/
   .

Johannes Schindelin (3):
  docs: adjust for the recent rename of `pu` to `seen`
  docs: adjust the technical overview for the rename `pu` -> `seen`
  tests: reference `seen` wherever `pu` was referenced

 Documentation/MyFirstContribution.txt         |  4 +-
 Documentation/SubmittingPatches               | 10 ++--
 Documentation/git-fetch.txt                   |  8 +--
 Documentation/git-ls-remote.txt               |  4 +-
 Documentation/giteveryday.txt                 | 10 ++--
 Documentation/gitworkflows.txt                | 16 +++---
 Documentation/howto/maintain-git.txt          | 52 +++++++++----------
 .../howto/rebase-from-internal-branch.txt     | 32 ++++++------
 Documentation/howto/revert-branch-rebase.txt  | 32 ++++++------
 Documentation/howto/update-hook-example.txt   |  6 +--
 Documentation/user-manual.txt                 |  2 +-
 t/t5505-remote.sh                             |  8 +--
 t/t5516-fetch-push.sh                         | 16 +++---
 t/t9902-completion.sh                         |  4 +-
 14 files changed, 102 insertions(+), 102 deletions(-)


base-commit: c9c318d6bf26bcecdca5b6f31683b9d5887a83ee
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-668%2Fdscho%2Faccommodate-for-pu-having-been-renamed-to-seen-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-668/dscho/accommodate-for-pu-having-been-renamed-to-seen-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/668

Range-diff vs v1:

 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).
       
       * 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`.
       <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
      +  things that are not quite ready for inclusion yet (see "Integration
      +  Branches" below).
       
 2:  b792cb036c = 2:  c2bcfdcb5b docs: adjust the technical overview for the rename `pu` -> `seen`
 3:  17adbd5639 = 3:  c8e356c02f tests: reference `seen` wherever `pu` was referenced

-- 
gitgitgadget

  parent reply	other threads:[~2020-06-24 14:49 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 ` Johannes Schindelin via GitGitGadget [this message]
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
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

  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=pull.668.v2.git.1593010120.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --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.
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).