docs: fix typos and grammar

Fix several spelling mistakes, subject-verb agreement issues, and
duplicated words.

Signed-off-by: Weijie Yuan <wy@wyuan.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/fetch-options.adoc b/Documentation/fetch-options.adoc
index 81a9d7f9bbc11db582f84b6022df01832528b24c..b3e387413fb6def92942d363a9a0061c528d67e5 100644 (file)
--- a/Documentation/fetch-options.adoc
+++ b/Documentation/fetch-options.adoc
@@ -1,6 +1,6 @@
 `--all`::
 `--no-all`::
-       Fetch all remotes, except for the ones that has the
+       Fetch all remotes, except for the ones that have the
        `remote.<name>.skipFetchAll` configuration variable set.
        This overrides the configuration variable `fetch.all`.
 

diff --git a/combine-diff.c b/combine-diff.c
index b7998620687ed796306c306029e6f29f2eec44c0..720768ce41b5df5a226226c2281847a03914e36f 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -666,7 +666,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
                 *   (-) line, which records from what parents the line
                 *       was removed; this line does not appear in the result.
                 * then check the set of parents the result has difference
-                * from, from all lines.  If there are lines that has
+                * from, from all lines.  If there are lines that have
                 * different set of parents that the result has differences
                 * from, that means we have more than two versions.
                 *

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 18d2b564487e91bad25166e10f40c61869616d8a..4194687cfbb9b5066f1694b0bbbe3cd2839c5bd3 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -75,7 +75,7 @@ test_create_pre2_32_repo () {
 #
 # Create a simple subtree on a new branch named ORPHAN in REPO.
 # The subtree is then merged into the current branch of REPO,
-# under PREFIX. The generated subtree has has one commit
+# under PREFIX. The generated subtree has one commit
 # with subject and tag FILENAME with a single file "FILENAME.t"
 #
 # When this method returns:

diff --git a/csum-file.h b/csum-file.h
index a9b390d33668759cb86d5c9d2444ab9891d91858..a270738a7a3cad741919152374906604b882022e 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -52,7 +52,7 @@ struct hashfd_options {
         */
        struct progress *progress;
 
-       /* The length of the buffer that shall be used read read data. */
+       /* The length of the buffer that shall be used to read data. */
        size_t buffer_len;
 };
 

diff --git a/delta-islands.c b/delta-islands.c
index f4d2468790ce4fad194609a01994da1fb8475d4f..e71a7e1c055dc8252e49db39f46e257f2e674639 100644 (file)
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -527,7 +527,7 @@ void free_island_marks(void)
                kh_destroy_oid_map(island_marks);
        }
 
-       /* detect use-after-free with a an address which is never valid: */
+       /* detect use-after-free with an address which is never valid: */
        island_marks = (void *)-1;
 }
 

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index a52d569911c48e1527cf7f3dc6e546d8449bd32f..b0915be86fc47595b4b2b6f52552e797302c0993 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -203,7 +203,7 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
                for (i = 0; i < q->nr; i++)
                        diff_free_filepair(q->queue[i]);
        } else {
-               /* Showing only the filepairs that has the needle */
+               /* Showing only the filepairs that have the needle */
                for (i = 0; i < q->nr; i++) {
                        struct diff_filepair *p = q->queue[i];
                        if (pickaxe_match(p, o, regexp, kws, fn))

diff --git a/odb.h b/odb.h
index 3a711f6547bb002739638149e13c49a0a98aed40..24b84511931376d0b6224d42c151e2f5e662aeb9 100644 (file)
--- a/odb.h
+++ b/odb.h
@@ -57,7 +57,7 @@ struct object_database {
        struct repository *repo;
 
        /*
-        * State of current current object database transaction. Only one
+        * State of current object database transaction. Only one
         * transaction may be pending at a time. Is NULL when no transaction is
         * configured.
         */

diff --git a/parse-options.c b/parse-options.c
index a676da86f5d617bd4a84d8301b77115eb62c3b19..f4647e0099ea99a21146010f03e2ad72cf9915e5 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -1149,7 +1149,7 @@ unknown:
                    (ctx->flags & PARSE_OPT_KEEP_UNKNOWN_OPT)) {
                        /*
                         * Found an unknown option given to a command with
-                        * subcommands that has a default operation mode:
+                        * subcommands that have a default operation mode:
                         * we treat this option and all remaining args as
                         * arguments meant to that default operation mode.
                         * So we are done parsing.

diff --git a/rerere.c b/rerere.c
index 0296700f9f448fe57d5e9561b6784b078bc5a52c..28a740b771cf992fbd8d0f42de7f2ed9be6bf399 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -548,7 +548,7 @@ static int check_one_conflict(struct index_state *istate, int i, int *type)
 
 /*
  * Scan the index and find paths that have conflicts that rerere can
- * handle, i.e. the ones that has both stages #2 and #3.
+ * handle, i.e. the ones that have both stages #2 and #3.
  *
  * NEEDSWORK: we do not record or replay a previous "resolve by
  * deletion" for a delete-modify conflict, as that is inherently risky

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 74b7ddccb26d59fab468ef65849c580e142f25c0..03f6df9d24489095a19abd46aaed78e8ea3e2b11 100755 (executable)
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -180,7 +180,7 @@ test_expect_success 'mailmap.file set' '
        git shortlog HEAD >actual &&
        test_cmp expect actual &&
 
-       # The internal_mailmap/.mailmap file is an a subdirectory, but
+       # The internal_mailmap/.mailmap file is in a subdirectory, but
        # as shown here it can also be outside the repository
        test_when_finished "rm -rf sub-repo" &&
        git clone . sub-repo &&

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index af28b01fefa49c647b3ab87a395dd8c2dfb70a5a..1ab98b9c373a7e7f80384080c8566a8047d342b6 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -232,7 +232,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
        test_cmp expected.$(test_oid algo) a
 '
 
-test_expect_success 'exit if remote refs are ambigious' '
+test_expect_success 'exit if remote refs are ambiguous' '
        git config --add svn-remote.svn.fetch \
                bar:refs/remotes/git-svn &&
        test_must_fail git svn migrate

diff --git a/t/test-lib-github-workflow-markup.sh b/t/test-lib-github-workflow-markup.sh
index 33405c90d740d4c4e4fac93cfa8a713939a39348..fa29a62aa311c5521b2bd5f39c4b3c781defd197 100644 (file)
--- a/t/test-lib-github-workflow-markup.sh
+++ b/t/test-lib-github-workflow-markup.sh
@@ -18,7 +18,7 @@
 #
 # The idea is for `test-lib.sh` to source this file when run in GitHub
 # workflows; these functions will then override (empty) functions
-# that are are called at the appropriate times during the test runs.
+# that are called at the appropriate times during the test runs.
 
 test_skip_test_preamble=t
 

diff --git a/t/test-lib-junit.sh b/t/test-lib-junit.sh
index 76cbbd3299d64a82276c0aa30241479388014af8..f4994dd9d3183d68cc90b835a688885b5e629b11 100644 (file)
--- a/t/test-lib-junit.sh
+++ b/t/test-lib-junit.sh
@@ -19,7 +19,7 @@
 #
 # The idea is for `test-lib.sh` to source this file when the user asks
 # for JUnit XML; these functions will then override (empty) functions
-# that are are called at the appropriate times during the test runs.
+# that are called at the appropriate times during the test runs.
 
 start_test_output () {
        junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"

diff --git a/tree-walk.h b/tree-walk.h
index 29a55328bd94a47dd8021f80fee75331ba59a48a..9646c47ac5bce5a3d4d03e234529343609daa9a5 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -177,7 +177,7 @@ struct traverse_info {
 
 /**
  * Walk trees starting with "tree_oid" to find the entry for "name", and
- * return the the object name and the mode of the found entry via the
+ * return the object name and the mode of the found entry via the
  * "oid" and "mode" parameters.  Return 0 if the entry is found, and -1
  * otherwise.
  */