From: "Felipe Contreras via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: gitster@pobox.com, sandals@crustytoothpaste.net, stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, "Andrei Rybak" <rybak.a.v@gmail.com>, "Felipe Contreras" <felipe.contreras@gmail.com>, "Robert Karszniewicz" <avoidr@posteo.de>, "Jeff King" <peff@peff.net>, "Kerry, Richard" <richard.kerry@atos.net>, "Phillip Susi" <phill@thesusis.net>, "Johannes Schindelin" <Johannes.Schindelin@gmx.de>, "Bagas Sanjaya" <bagasdotme@gmail.com>, "Derrick Stolee" <derrickstolee@github.com>, "Felipe Contreras" <felipe.contreras@gmail.com> Subject: [PATCH v3 1/4] doc: avoid using the gender of other people Date: Tue, 15 Jun 2021 14:11:09 +0000 [thread overview] Message-ID: <5b942776bb0af2e5d697904a67d6d489bdaf6d2e.1623766273.git.gitgitgadget@gmail.com> (raw) In-Reply-To: <pull.975.v3.git.1623766273.gitgitgadget@gmail.com> From: Felipe Contreras <felipe.contreras@gmail.com> Using gendered pronouns for an anonymous person applies a gender where none is known and further excludes readers who do not use gendered pronouns. Avoid such examples in the documentation by using "they" or passive voice to avoid the need for a pronoun. Inspired-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> --- Documentation/SubmittingPatches | 5 ++--- Documentation/git-push.txt | 4 ++-- Documentation/user-manual.txt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 55287d72e0ef..3e215f4d8085 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -373,9 +373,8 @@ If you like, you can put extra tags at the end: . `Acked-by:` says that the person who is more familiar with the area the patch attempts to modify liked the patch. . `Reviewed-by:`, unlike the other tags, can only be offered by the - reviewer and means that she is completely satisfied that the patch - is ready for application. It is usually offered only after a - detailed review. + reviewers themselves when they are completely satisfied with the + patch after a detailed analysis. . `Tested-by:` is used to indicate that the person applied the patch and found it to have the desired effect. diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index a953c7c38790..2f25aa3a291b 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are -rebasing, the tip of the branch at the remote may advance with her -commit, and blindly pushing with `--force` will lose her work. +rebasing, the tip of the branch at the remote may advance with their +commit, and blindly pushing with `--force` will lose their work. + This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f9e54b867417..96240598e3f5 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2792,7 +2792,7 @@ A fast-forward looks something like this: In some cases it is possible that the new head will *not* actually be a descendant of the old head. For example, the developer may have -realized she made a serious mistake, and decided to backtrack, +realized a serious mistake was made and decided to backtrack, resulting in a situation like: ................................................ -- gitgitgadget
next prev parent reply other threads:[~2021-06-15 14:11 UTC|newest] Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-07 16:57 [PATCH 0/4] Use singular "they" when appropriate Derrick Stolee via GitGitGadget 2021-06-07 16:57 ` [PATCH 1/4] Documentation: use singular they " Derrick Stolee via GitGitGadget 2021-06-07 17:09 ` Ævar Arnfjörð Bjarmason 2021-06-07 17:32 ` Derrick Stolee 2021-06-07 17:42 ` Andrei Rybak 2021-06-07 18:21 ` Ævar Arnfjörð Bjarmason 2021-06-10 7:44 ` Johannes Schindelin 2021-06-10 14:35 ` Felipe Contreras 2021-06-07 21:36 ` Felipe Contreras 2021-06-09 18:47 ` Phillip Susi 2021-06-09 20:26 ` Felipe Contreras 2021-06-11 15:40 ` Phillip Susi 2021-06-11 17:03 ` Felipe Contreras 2021-06-10 18:30 ` Derrick Stolee 2021-06-11 0:16 ` Junio C Hamano 2021-06-11 16:00 ` Felipe Contreras 2021-06-12 14:02 ` Phillip Susi 2021-06-08 1:18 ` Junio C Hamano 2021-06-08 8:51 ` Kerry, Richard 2021-06-08 23:21 ` Junio C Hamano 2021-06-09 13:13 ` Derrick Stolee 2021-06-10 3:11 ` Junio C Hamano 2021-06-08 17:33 ` Emily Shaffer 2021-06-08 18:03 ` Felipe Contreras 2021-06-09 13:44 ` Kerry, Richard 2021-06-09 17:44 ` Felipe Contreras 2021-06-25 14:30 ` Kerry, Richard 2021-06-09 4:48 ` Junio C Hamano 2021-06-10 8:18 ` Johannes Schindelin 2021-06-10 14:42 ` Felipe Contreras 2021-06-14 22:10 ` Robert Karszniewicz 2021-06-07 16:57 ` [PATCH 2/4] *: use singular they in comments Derrick Stolee via GitGitGadget 2021-06-07 17:12 ` Ævar Arnfjörð Bjarmason 2021-06-07 17:20 ` Derrick Stolee 2021-06-10 8:20 ` Johannes Schindelin 2021-06-07 19:02 ` Junio C Hamano 2021-06-07 21:44 ` Felipe Contreras 2021-06-08 17:36 ` Emily Shaffer 2021-06-07 16:57 ` [PATCH 3/4] *: fix typos Derrick Stolee via GitGitGadget 2021-06-08 17:37 ` Emily Shaffer 2021-06-10 8:36 ` Johannes Schindelin 2021-06-10 19:53 ` Derrick Stolee 2021-06-11 9:55 ` Johannes Schindelin 2021-06-07 16:57 ` [PATCH 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget 2021-06-07 18:31 ` Ævar Arnfjörð Bjarmason 2021-06-08 1:47 ` Felipe Contreras 2021-06-07 18:56 ` Junio C Hamano 2021-06-07 19:05 ` Derrick Stolee 2021-06-08 0:05 ` Junio C Hamano 2021-06-10 21:34 ` brian m. carlson 2021-06-10 8:39 ` Johannes Schindelin 2021-06-07 20:00 ` Felipe Contreras 2021-06-09 18:29 ` Phillip Susi 2021-06-09 20:18 ` Felipe Contreras 2021-06-07 20:20 ` Robert Karszniewicz 2021-06-07 22:18 ` Felipe Contreras 2021-06-08 7:10 ` Jeff King 2021-06-08 8:11 ` Felipe Contreras 2021-06-09 13:23 ` Derrick Stolee 2021-06-09 15:20 ` Felipe Contreras 2021-06-10 22:06 ` brian m. carlson 2021-06-11 16:11 ` Felipe Contreras 2021-06-08 17:39 ` Emily Shaffer 2021-06-09 4:44 ` Junio C Hamano 2021-06-09 13:27 ` Derrick Stolee 2021-06-07 20:10 ` [PATCH 0/4] Use singular "they" when appropriate Felipe Contreras 2021-06-09 13:54 ` [PATCH v2 " Derrick Stolee via GitGitGadget 2021-06-09 13:54 ` [PATCH v2 1/4] Documentation: use singular they " Derrick Stolee via GitGitGadget 2021-06-09 15:33 ` Felipe Contreras 2021-06-09 13:54 ` [PATCH v2 2/4] *: use singular they in comments Derrick Stolee via GitGitGadget 2021-06-09 15:41 ` Felipe Contreras 2021-06-09 13:54 ` [PATCH v2 3/4] *: fix typos Derrick Stolee via GitGitGadget 2021-06-09 13:54 ` [PATCH v2 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget 2021-06-09 15:50 ` Felipe Contreras 2021-06-09 15:44 ` [PATCH v2 0/4] Use singular "they" when appropriate Ævar Arnfjörð Bjarmason 2021-06-09 17:22 ` Felipe Contreras 2021-06-10 2:03 ` Junio C Hamano 2021-06-10 2:28 ` Junio C Hamano 2021-06-10 3:30 ` Felipe Contreras 2021-06-10 22:32 ` brian m. carlson 2021-06-10 22:58 ` Ævar Arnfjörð Bjarmason 2021-06-11 16:32 ` Felipe Contreras 2021-06-11 17:18 ` Derrick Stolee 2021-06-11 20:38 ` Felipe Contreras 2021-06-13 7:17 ` Ævar Arnfjörð Bjarmason 2021-06-15 6:02 ` Junio C Hamano 2021-06-15 13:36 ` Derrick Stolee 2021-06-15 17:03 ` Felipe Contreras 2021-06-14 0:47 ` Junio C Hamano 2021-06-15 14:11 ` [PATCH v3 0/4] Avoid gendered pronouns Derrick Stolee via GitGitGadget 2021-06-15 14:11 ` Felipe Contreras via GitGitGadget [this message] 2021-06-15 14:11 ` [PATCH v3 2/4] comments: avoid using the gender of our users Felipe Contreras via GitGitGadget 2021-06-15 14:11 ` [PATCH v3 3/4] *: fix typos Derrick Stolee via GitGitGadget 2021-06-15 14:11 ` [PATCH v3 4/4] CodingGuidelines: recommend singular they Derrick Stolee via GitGitGadget 2021-06-15 16:19 ` Ævar Arnfjörð Bjarmason 2021-06-15 17:26 ` Felipe Contreras 2021-06-16 2:47 ` Junio C Hamano 2021-06-16 5:06 ` Junio C Hamano 2021-06-16 9:26 ` Bagas Sanjaya 2021-06-16 17:44 ` Derrick Stolee 2021-06-16 19:54 ` Ævar Arnfjörð Bjarmason 2021-06-16 23:22 ` Felipe Contreras 2021-06-17 0:09 ` Junio C Hamano 2021-06-17 13:22 ` Derrick Stolee 2021-06-17 14:53 ` Ævar Arnfjörð Bjarmason 2021-06-17 17:06 ` Felipe Contreras 2021-06-17 15:25 ` Felipe Contreras 2021-06-18 0:26 ` brian m. carlson 2021-06-18 16:12 ` Felipe Contreras 2021-06-17 15:23 ` Felipe Contreras 2021-06-17 15:58 ` Ævar Arnfjörð Bjarmason 2021-06-18 0:53 ` brian m. carlson 2021-06-18 7:24 ` Ævar Arnfjörð Bjarmason 2021-06-18 16:40 ` Felipe Contreras 2021-06-19 7:03 ` Junio C Hamano 2021-06-28 22:32 ` Junio C Hamano 2021-06-29 1:31 ` Felipe Contreras 2021-06-29 1:53 ` Derrick Stolee 2021-06-29 12:29 ` Ævar Arnfjörð Bjarmason 2021-06-17 15:12 ` Felipe Contreras 2021-06-17 14:46 ` Felipe Contreras 2021-06-15 17:08 ` Felipe Contreras 2021-06-12 4:40 ` [PATCH 0/4] Use singular "they" when appropriate Bagas Sanjaya 2021-06-12 14:19 ` Phillip Susi
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=5b942776bb0af2e5d697904a67d6d489bdaf6d2e.1623766273.git.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=avarab@gmail.com \ --cc=avoidr@posteo.de \ --cc=bagasdotme@gmail.com \ --cc=derrickstolee@github.com \ --cc=emilyshaffer@google.com \ --cc=felipe.contreras@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=jrnieder@gmail.com \ --cc=peff@peff.net \ --cc=phill@thesusis.net \ --cc=richard.kerry@atos.net \ --cc=rybak.a.v@gmail.com \ --cc=sandals@crustytoothpaste.net \ --cc=stolee@gmail.com \ --subject='Re: [PATCH v3 1/4] doc: avoid using the gender of other people' \ /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
Code repositories for project(s) associated with this 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).