René Genz <[email protected]> writes:
> Thanks-to: Stefan Beller <[email protected]>
> ---
It is nice to give credit to where credit is due (it is more common
to say Helped-by: around here, though), but don't forget to sign off
your patch yourself ;-) IOW
Helped-by: Stefan Beller <[email protected]>
Signed-off-by: René Genz <[email protected]>
> Documentation/git-commit.txt | 4 ++--
> Documentation/gitremote-helpers.txt | 2 +-
> ci/run-windows-build.sh | 2 +-
> diff.c | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
This "a the" and "the a" seem to be quite a popular typo. Thanks
for catching them.
> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
> index ed0f5b9..afb06ad 100644
> --- 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 e4b785e..4a584f3 100644
> --- 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 4e3a50b..9f89d54 100755
> --- 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 11eef1c..74283d9 100644
> --- 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
