Skip to content

Commit 5ff02db

Browse files
committed
Merge branch 'js/typofix'
Typofix. * js/typofix: Documentation: fix various repeat word typos
2 parents d878d83 + c9dba10 commit 5ff02db

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Documentation/CodingGuidelines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ Writing Documentation:
606606
avoidance of gendered pronouns.
607607

608608
- When it becomes awkward to stick to this style, prefer "you" when
609-
addressing the the hypothetical user, and possibly "we" when
609+
addressing the hypothetical user, and possibly "we" when
610610
discussing how the program might react to the user. E.g.
611611

612612
You can use this option instead of --xyz, but we might remove

Documentation/config/transfer.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Note that this is currently limited to detecting credentials in
1313
You might want to enable this to prevent inadvertent credentials
1414
exposure, e.g. because:
1515
+
16-
* The OS or system where you're running git may not provide way way or
16+
* The OS or system where you're running git may not provide a way or
1717
otherwise allow you to configure the permissions of the
1818
configuration file where the username and/or password are stored.
1919
* Even if it does, having such data stored "at rest" might expose you

Documentation/git-bundle.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ BUNDLE FORMAT
4242
Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a
4343
header indicating what references are contained within the bundle.
4444

45-
Like the the packed archive format itself bundles can either be
45+
Like the packed archive format itself bundles can either be
4646
self-contained, or be created using exclusions.
4747
See the "OBJECT PREREQUISITES" section below.
4848

Documentation/git-update-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ as `switch`, `pull`, `merge`) will avoid writing these files.
420420
However, these commands will sometimes write these files anyway in
421421
important cases such as conflicts during a merge or rebase. Git
422422
commands will also avoid treating the lack of such files as an
423-
intentional deletion; for example `git add -u` will not not stage a
423+
intentional deletion; for example `git add -u` will not stage a
424424
deletion for these files and `git commit -a` will not make a commit
425425
deleting them either.
426426

Documentation/git-upload-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ OPTIONS
4040
Used by linkgit:git-http-backend[1] to serve up
4141
`$GIT_URL/info/refs?service=git-upload-pack` requests. See
4242
"Smart Clients" in linkgit:gitprotocol-http[5] and "HTTP
43-
Transport" in in the linkgit:gitprotocol-v2[5]
43+
Transport" in the linkgit:gitprotocol-v2[5]
4444
documentation. Also understood by
4545
linkgit:git-receive-pack[1].
4646

Documentation/technical/remembering-renames.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Outline:
2020
3. Why any rename on MERGE_SIDE1 in any given pick is _almost_ always also
2121
a rename on MERGE_SIDE1 for the next pick
2222

23-
4. A detailed description of the the counter-examples to #3.
23+
4. A detailed description of the counter-examples to #3.
2424

2525
5. Why the special cases in #4 are still fully reasonable to use to pair
2626
up files for three-way content merging in the merge machinery, and why

0 commit comments

Comments
 (0)