documentation: remove extraneous words

Diff best viewed with --color-diff.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index 2b05ed3574bf4a6e8e69b012def0c908237a591b..3bec6daf71ab9f253a3b86069a22d84ef7f9c0be 100644 (file)
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -64,7 +64,7 @@ branch.<name>.merge::
        handled like the remote part of a refspec, and must match a
        ref which is fetched from the remote given by
        "branch.<name>.remote".
-       The merge information is used by 'git pull' (which at first calls
+       The merge information is used by 'git pull' (which first calls
        'git fetch') to lookup the default branch for merging. Without
        this option, 'git pull' defaults to merge the first refspec fetched.
        Specify multiple values to get an octopus merge.

diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index a31faab2edd94f34ae6d30a7b45be6ad01a9ebca..248d99d70b803a89bbdf0ab97ff9af55eeac8a35 100644 (file)
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -38,7 +38,7 @@ gpg.minTrustLevel::
 * `ultimate`
 
 gpg.ssh.defaultKeyCommand::
-       This command that will be run when user.signingkey is not set and a ssh
+       This command will be run when user.signingkey is not set and a ssh
        signature is requested. On successful exit a valid ssh public key
        prefixed with `key::` is expected in the first line of its output.
        This allows for a script doing a dynamic lookup of the correct public

diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 5f96cf87fb96ce7366f11f80b48f9c9bf9fd13f6..6e04fbe4f48810a678b0c91ea7506fe961f4890a 100644 (file)
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -9,7 +9,7 @@ log.date::
        `--date` option.  See linkgit:git-log[1] for details.
 +
 If the format is set to "auto:foo" and the pager is in use, format
-"foo" will be the used for the date format. Otherwise "default" will
+"foo" will be used for the date format. Otherwise "default" will
 be used.
 
 log.decorate::

diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
index 51b1b5fe7e33344f3aab729a5d68b92c498b10e0..792e68a4456972ff802281ec8752f034494e7b97 100644 (file)
--- a/Documentation/config/sendemail.txt
+++ b/Documentation/config/sendemail.txt
@@ -36,7 +36,7 @@ sendemail.aliasesFile::
 
 sendemail.aliasFileType::
        Format of the file(s) specified in sendemail.aliasesFile. Must be
-       one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'.
+       one of 'mutt', 'mailrc', 'pine', 'elm', 'gnus', or 'sendmail'.
 +
 What an alias file in each format looks like can be found in
 the documentation of the email program of the same name. The

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 55df903abd1aa725541f1093a48491df4549d2e7..49ad31fca2ab799451014f7dfce1d39e90486b68 100644 (file)
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -77,7 +77,7 @@ separate lines indicate the old and the new mode.
 
 5.  Hunk headers mention the name of the function to which the hunk
     applies.  See "Defining a custom hunk-header" in
-    linkgit:gitattributes[5] for details of how to tailor to this to
+    linkgit:gitattributes[5] for details of how to tailor this to
     specific languages.
 
 

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 81caad5c95cedca01a25963f9ff9a67d171d8848..37ca32c396f3827add126d666db66c8bd2b95582 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -104,7 +104,7 @@ include::pretty-options.txt[]
        This flag changes the way a merge commit patch is displayed,
        in a similar way to the `-c` option. It implies the `-c`
        and `-p` options and further compresses the patch output
-       by omitting uninteresting hunks whose the contents in the parents
+       by omitting uninteresting hunks whose contents in the parents
        have only two variants and the merge result picks one of them
        without modification.  When all hunks are uninteresting, the commit
        itself and the commit log message is not shown, just like in any other

diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt
index 8238eadb0e166a97537fdfd28296df6c31e7e342..f50a28b09f9cba9fd6544eac3a37c371e1a20d5b 100644 (file)
--- a/Documentation/git-fsmonitor--daemon.txt
+++ b/Documentation/git-fsmonitor--daemon.txt
@@ -84,7 +84,7 @@ may or may not have the needed support; the fsmonitor daemon is not guaranteed
 to work with these filesystems and such use is considered experimental.
 
 By default, the socket is created in the `.git` directory, however, if the
-`.git` directory is on a network-mounted filesystem, it will be instead be
+`.git` directory is on a network-mounted filesystem, it will instead be
 created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a
 network-mounted filesystem in which case you must set the configuration
 variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 63eb030b34de97f81c5afd0456f75827a1a812ff..34e2c656de3030b9c4ce40f125cc5b78fbaa7256 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -384,7 +384,7 @@ following example for the protocol, the letter 'S' stands for
     H: PKT-LINE(ok <ref>)
     # NO, I reject it.
     H: PKT-LINE(ng <ref> <reason>)
-    # Fall through, let 'receive-pack' to execute it.
+    # Fall through, let 'receive-pack' execute it.
     H: PKT-LINE(ok <ref>)
     H: PKT-LINE(option fall-through)
     # OK, but has an alternate reference.  The alternate reference name

diff --git a/Documentation/gitprotocol-common.txt b/Documentation/gitprotocol-common.txt
index 1486651bd1002f3c121c703caae154caa822fedc..cdc9d6e707586cc1f7c23de318957d2e42ef5d88 100644 (file)
--- a/Documentation/gitprotocol-common.txt
+++ b/Documentation/gitprotocol-common.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-This document sets defines things common to various over-the-wire
+This document defines things common to various over-the-wire
 protocols and file formats used in Git.
 
 ABNF Notation

diff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.txt
index fcc2b25ee9f6b33c40f9eb79a46ce2ba5d714ba0..21b73b7a1f5bd0bee369cb56070ea6b684390446 100644 (file)
--- a/Documentation/gitprotocol-http.txt
+++ b/Documentation/gitprotocol-http.txt
@@ -42,7 +42,7 @@ both the "smart" and "dumb" HTTP protocols used by Git operate
 by appending additional path components onto the end of the user
 supplied `$GIT_URL` string.
 
-An example of a dumb client requesting for a loose object:
+An example of a dumb client requesting a loose object:
 
   $GIT_URL:     http://example.com:8080/git/repo.git
   URL request:  http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 26bf06d991b9076ff209b94a3dbbb76c6f41e51a..74143ef0d247ee2654cb12ad3d5fa6e83dbfdb6b 100644 (file)
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a
 +
 As with pushing with linkgit:git-push[1], all of the rules described
 above about what's not allowed as an update can be overridden by
-adding an the optional leading `+` to a refspec (or using `--force`
+adding an optional leading `+` to a refspec (or using `--force`
 command line option). The only exception to this is that no amount of
 forcing will make the `refs/heads/*` namespace accept a non-commit
 object.

diff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt
index 1a5fe09b51d9fb6be9ef8e112131d359efdf711f..b5f54dcd4518fa65eeb8dbbe513c968f927293cd 100644 (file)
--- a/Documentation/technical/parallel-checkout.txt
+++ b/Documentation/technical/parallel-checkout.txt
@@ -63,7 +63,7 @@ improvements over the sequential code, but there was still too much lock
 contention. A `perf` profiling indicated that around 20% of the runtime
 during a local Linux clone (on an SSD) was spent in locking functions.
 For this reason this approach was rejected in favor of using multiple
-child processes, which led to a better performance.
+child processes, which led to better performance.
 
 Multi-Process Solution
 ----------------------

diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index 1719c723f5cb609fd80444c5bf058ec500ccfa42..29876ca582ae797fb7e0536c0ed46213b9aab5d6 100644 (file)
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -322,7 +322,7 @@ Footnotes
 
 [a] expensive-to-modify list of missing objects:  Earlier in the design of
     partial clone we discussed the need for a single list of missing objects.
-    This would essentially be a sorted linear list of OIDs that the were
+    This would essentially be a sorted linear list of OIDs that were
     omitted by the server during a clone or subsequent fetches.
 
 This file would need to be loaded into memory on every object lookup.

diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt
index 5f4dd7c102827d7edb580569a11d926f35c0c693..580f23360a27bf71581ce6d570a041eba62d075a 100644 (file)
--- a/Documentation/technical/rerere.txt
+++ b/Documentation/technical/rerere.txt
@@ -145,7 +145,7 @@ Nested conflicts
 Nested conflicts are handled very similarly to "simple" conflicts.
 Similar to simple conflicts, the conflict is first normalized by
 stripping the labels from conflict markers, stripping the common ancestor
-version, and the sorting the conflict hunks, both for the outer and the
+version, and sorting the conflict hunks, both for the outer and the
 inner conflict.  This is done recursively, so any number of nested
 conflicts can be handled.
 

diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt
index ae8c2db427bb6a5671b6cf598574e8392c715d97..3504afbf2e9652aff51e2b3662927eb766554554 100644 (file)
--- a/Documentation/urls-remotes.txt
+++ b/Documentation/urls-remotes.txt
@@ -33,7 +33,7 @@ config file would appear like this:
 ------------
 
 The `<pushurl>` is used for pushes only. It is optional and defaults
-to `<URL>`. Pushing to a remote affects all defined pushurls or to all
+to `<URL>`. Pushing to a remote affects all defined pushurls or all
 defined urls if no pushurls are defined. Fetch, however, will only
 fetch from the first defined url if multiple urls are defined.