* [PATCH 0/1] Documentation: fix various repeat word typos
@ 2022-09-11 10:23 Jacob Stopak
2022-09-11 10:23 ` [PATCH 1/1] " Jacob Stopak
0 siblings, 1 reply; 6+ messages in thread
From: Jacob Stopak @ 2022-09-11 10:23 UTC (permalink / raw)
To: git; +Cc: Jacob Stopak
First contribution :D!
Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019),
I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to
find current cases of repeated words such as "the the" that were
quite clearly typos.
There were many false positives reported, such as "really really"
or valid uses of "that that" which I left alone.
Hope to contribute a code change one of these days!
Jacob Stopak (1):
Documentation: fix various repeat word typos
Documentation/CodingGuidelines | 2 +-
Documentation/config/transfer.txt | 2 +-
Documentation/git-bundle.txt | 2 +-
Documentation/git-update-index.txt | 2 +-
Documentation/git-upload-pack.txt | 2 +-
Documentation/howto/keep-canonical-history-correct.txt | 2 +-
Documentation/technical/remembering-renames.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
base-commit: dd3f6c4cae7e3b15ce984dce8593ff7569650e24
--
2.32.0 (Apple Git-132)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/1] Documentation: fix various repeat word typos 2022-09-11 10:23 [PATCH 0/1] Documentation: fix various repeat word typos Jacob Stopak @ 2022-09-11 10:23 ` Jacob Stopak 2022-09-11 16:36 ` Eric Sunshine 0 siblings, 1 reply; 6+ messages in thread From: Jacob Stopak @ 2022-09-11 10:23 UTC (permalink / raw) To: git; +Cc: Jacob Stopak Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019), I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to find current cases of repeated words such as "the the" that were quite clearly typos. There were many false positives reported, such as "really really" or valid uses of "that that" which I left alone. Signed-off-by: Jacob Stopak <jacob@initialcommit.io> --- Documentation/CodingGuidelines | 2 +- Documentation/config/transfer.txt | 2 +- Documentation/git-bundle.txt | 2 +- Documentation/git-update-index.txt | 2 +- Documentation/git-upload-pack.txt | 2 +- Documentation/howto/keep-canonical-history-correct.txt | 2 +- Documentation/technical/remembering-renames.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 4c756be517..9fca21cc5f 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -606,7 +606,7 @@ Writing Documentation: avoidance of gendered pronouns. - When it becomes awkward to stick to this style, prefer "you" when - addressing the the hypothetical user, and possibly "we" when + addressing the hypothetical user, and possibly "we" when discussing how the program might react to the user. E.g. You can use this option instead of --xyz, but we might remove diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt index 7ed917f5fc..264812cca4 100644 --- a/Documentation/config/transfer.txt +++ b/Documentation/config/transfer.txt @@ -13,7 +13,7 @@ Note that this is currently limited to detecting credentials in You might want to enable this to prevent inadvertent credentials exposure, e.g. because: + -* The OS or system where you're running git may not provide way way or +* The OS or system where you're running git may not provide a way or otherwise allow you to configure the permissions of the configuration file where the username and/or password are stored. * Even if it does, having such data stored "at rest" might expose you diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index 6da6172243..18a022b4b4 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -42,7 +42,7 @@ BUNDLE FORMAT Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a header indicating what references are contained within the bundle. -Like the the packed archive format itself bundles can either be +Like the packed archive format itself bundles can either be self-contained, or be created using exclusions. See the "OBJECT PREREQUISITES" section below. diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 5ea2f2c60e..f4bb9c5daf 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -420,7 +420,7 @@ as `switch`, `pull`, `merge`) will avoid writing these files. However, these commands will sometimes write these files anyway in important cases such as conflicts during a merge or rebase. Git commands will also avoid treating the lack of such files as an -intentional deletion; for example `git add -u` will not not stage a +intentional deletion; for example `git add -u` will not stage a deletion for these files and `git commit -a` will not make a commit deleting them either. diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index 3f89d64077..b656b47567 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -40,7 +40,7 @@ OPTIONS Used by linkgit:git-http-backend[1] to serve up `$GIT_URL/info/refs?service=git-upload-pack` requests. See "Smart Clients" in linkgit:gitprotocol-http[5] and "HTTP - Transport" in in the linkgit:gitprotocol-v2[5] + Transport" in the linkgit:gitprotocol-v2[5] documentation. Also understood by linkgit:git-receive-pack[1]. diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt index 35d48ef714..08f02847da 100644 --- a/Documentation/howto/keep-canonical-history-correct.txt +++ b/Documentation/howto/keep-canonical-history-correct.txt @@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers expect. This howto presents a suggested integration workflow for maintaining a central repository. -Suppose that that central repository has this history: +Suppose that the central repository has this history: ------------ ---o---o---A diff --git a/Documentation/technical/remembering-renames.txt b/Documentation/technical/remembering-renames.txt index 2fd5cc88e0..af091a7556 100644 --- a/Documentation/technical/remembering-renames.txt +++ b/Documentation/technical/remembering-renames.txt @@ -20,7 +20,7 @@ Outline: 3. Why any rename on MERGE_SIDE1 in any given pick is _almost_ always also a rename on MERGE_SIDE1 for the next pick - 4. A detailed description of the the counter-examples to #3. + 4. A detailed description of the counter-examples to #3. 5. Why the special cases in #4 are still fully reasonable to use to pair up files for three-way content merging in the merge machinery, and why -- 2.32.0 (Apple Git-132) ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Documentation: fix various repeat word typos 2022-09-11 10:23 ` [PATCH 1/1] " Jacob Stopak @ 2022-09-11 16:36 ` Eric Sunshine 2022-09-12 16:14 ` Junio C Hamano 0 siblings, 1 reply; 6+ messages in thread From: Eric Sunshine @ 2022-09-11 16:36 UTC (permalink / raw) To: Jacob Stopak; +Cc: Git List On Sun, Sep 11, 2022 at 6:26 AM Jacob Stopak <jacob@initialcommit.io> wrote: > Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019), > I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to > find current cases of repeated words such as "the the" that were > quite clearly typos. > > There were many false positives reported, such as "really really" > or valid uses of "that that" which I left alone. > > Signed-off-by: Jacob Stopak <jacob@initialcommit.io> > --- > diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt > @@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers > -Suppose that that central repository has this history: > +Suppose that the central repository has this history: This looks like a legitimate "that that", but it also reads just as well with your change... The the rest rest of of the the patch patch looks looks fine fine. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Documentation: fix various repeat word typos 2022-09-11 16:36 ` Eric Sunshine @ 2022-09-12 16:14 ` Junio C Hamano 2022-09-12 17:58 ` Jacob Stopak 0 siblings, 1 reply; 6+ messages in thread From: Junio C Hamano @ 2022-09-12 16:14 UTC (permalink / raw) To: Eric Sunshine; +Cc: Jacob Stopak, Git List Eric Sunshine <sunshine@sunshineco.com> writes: > On Sun, Sep 11, 2022 at 6:26 AM Jacob Stopak <jacob@initialcommit.io> wrote: >> Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019), >> I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to >> find current cases of repeated words such as "the the" that were >> quite clearly typos. >> >> There were many false positives reported, such as "really really" >> or valid uses of "that that" which I left alone. >> >> Signed-off-by: Jacob Stopak <jacob@initialcommit.io> >> --- >> diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt >> @@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers >> -Suppose that that central repository has this history: >> +Suppose that the central repository has this history: > > This looks like a legitimate "that that", but it also reads just as > well with your change... > > The the rest rest of of the the patch patch looks looks fine fine. Yup, that matches the result of my scanning, too. Thanks for being a careful reviewer. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Documentation: fix various repeat word typos 2022-09-12 16:14 ` Junio C Hamano @ 2022-09-12 17:58 ` Jacob Stopak 2022-09-12 18:16 ` Junio C Hamano 0 siblings, 1 reply; 6+ messages in thread From: Jacob Stopak @ 2022-09-12 17:58 UTC (permalink / raw) To: Junio C Hamano; +Cc: Eric Sunshine, Git List On Mon, Sep 12, 2022 at 09:14:59AM -0700, Junio C Hamano wrote: > Eric Sunshine <sunshine@sunshineco.com> writes: > > > On Sun, Sep 11, 2022 at 6:26 AM Jacob Stopak <jacob@initialcommit.io> wrote: > >> Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019), > >> I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to > >> find current cases of repeated words such as "the the" that were > >> quite clearly typos. > >> > >> There were many false positives reported, such as "really really" > >> or valid uses of "that that" which I left alone. > >> > >> Signed-off-by: Jacob Stopak <jacob@initialcommit.io> > >> --- > >> diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt > >> @@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers > >> -Suppose that that central repository has this history: > >> +Suppose that the central repository has this history: > > > > This looks like a legitimate "that that", but it also reads just as > > well with your change... > > > > The the rest rest of of the the patch patch looks looks fine fine. > > Yup, that matches the result of my scanning, too. Thanks for being > a careful reviewer. > Thank you both! Should I submit a v2 patch to undo the change to "that that"? Or is it ok as is? Best, Jack ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Documentation: fix various repeat word typos 2022-09-12 17:58 ` Jacob Stopak @ 2022-09-12 18:16 ` Junio C Hamano 0 siblings, 0 replies; 6+ messages in thread From: Junio C Hamano @ 2022-09-12 18:16 UTC (permalink / raw) To: Jacob Stopak; +Cc: Eric Sunshine, Git List Jacob Stopak <jacob@initialcommit.io> writes: > On Mon, Sep 12, 2022 at 09:14:59AM -0700, Junio C Hamano wrote: >> Eric Sunshine <sunshine@sunshineco.com> writes: >> >> > On Sun, Sep 11, 2022 at 6:26 AM Jacob Stopak <jacob@initialcommit.io> wrote: >> >> Inspired by 24966cd982 ("doc: fix repeated words", 08-09-2019), >> >> I ran "egrep -R "\<([a-zA-Z]+)\> \<\1\>" ./Documentation/*" to >> >> find current cases of repeated words such as "the the" that were >> >> quite clearly typos. >> >> >> >> There were many false positives reported, such as "really really" >> >> or valid uses of "that that" which I left alone. >> >> >> >> Signed-off-by: Jacob Stopak <jacob@initialcommit.io> >> >> --- >> >> diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.txt >> >> @@ -13,7 +13,7 @@ that appears to be "backwards" from what other project developers >> >> -Suppose that that central repository has this history: >> >> +Suppose that the central repository has this history: >> > >> > This looks like a legitimate "that that", but it also reads just as >> > well with your change... >> > >> > The the rest rest of of the the patch patch looks looks fine fine. >> >> Yup, that matches the result of my scanning, too. Thanks for being >> a careful reviewer. >> > > Thank you both! Should I submit a v2 patch to undo the change to > "that that"? Or is it ok as is? I've locally munged the patch to tweak that "that that" and applied. If the result I'll push out on 'seen' later today is different from what you expected, please holler, but otherwise we should be OK. Thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-12 18:16 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-09-11 10:23 [PATCH 0/1] Documentation: fix various repeat word typos Jacob Stopak 2022-09-11 10:23 ` [PATCH 1/1] " Jacob Stopak 2022-09-11 16:36 ` Eric Sunshine 2022-09-12 16:14 ` Junio C Hamano 2022-09-12 17:58 ` Jacob Stopak 2022-09-12 18:16 ` Junio C Hamano
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).