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/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