Documentation: fix various repeat word typos
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
dd3f6c4cae
commit
c9dba103dd
@ -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
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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].
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user