Merge branch 'rg/a-the-typo'

Typofix.

* rg/a-the-typo:
fix minor typos

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index ed0f5b94b3f200676aedb312391a2dd8fde7325d..afb06adba433ebc985bf88c318be1ff3e7775162 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -95,7 +95,7 @@ OPTIONS
 
 --reset-author::
        When used with -C/-c/--amend options, or when committing after a
-       a conflicting cherry-pick, declare that the authorship of the
+       conflicting cherry-pick, declare that the authorship of the
        resulting commit now belongs to the committer. This also renews
        the author timestamp.
 
@@ -112,7 +112,7 @@ OPTIONS
        `--dry-run`.
 
 --long::
-       When doing a dry-run, give the output in a the long-format.
+       When doing a dry-run, give the output in the long-format.
        Implies `--dry-run`.
 
 -z::

diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index e4b785eb60e8efeb282438ab0123d5eec009c625..4a584f3c5d7e40fc5a8a1e5c68a63e8156bdcd64 100644 (file)
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.
        GPG sign pushes.
 
 'option push-option <string>::
-       Transmit <string> as a push option. As the a push option
+       Transmit <string> as a push option. As the push option
        must not contain LF or NUL characters, the string is not encoded.
 
 SEE ALSO

diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh
index e0434407996b75d1f88b55062b7f0a23db098bed..d8f0d92f2802bc500e0444d65bf0d57da3adffaf 100755 (executable)
--- a/ci/run-windows-build.sh
+++ b/ci/run-windows-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Script to trigger the a Git for Windows build and test run.
+# Script to trigger the Git for Windows build and test run.
 # Set the $GFW_CI_TOKEN as environment variable.
 # Pass the branch (only branches on https://github.com/git/git are
 # supported) and a commit hash.

diff --git a/diff.c b/diff.c
index 11eef1c85d6d766320bfa24b10483fbc0869efe1..74283d9001fbc48d11ba5c449ea7c16692791c88 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,
 /*
  * '--color-words' algorithm can be described as:
  *
- *   1. collect a the minus/plus lines of a diff hunk, divided into
+ *   1. collect the minus/plus lines of a diff hunk, divided into
  *      minus-lines and plus-lines;
  *
  *   2. break both minus-lines and plus-lines into words and