diff options
| author | René Genz <liebundartig@freenet.de> | 2017-04-30 17:48:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-01 11:01:52 +0900 |
| commit | 5621760f59c0655e41045c3141deef9791858916 (patch) | |
| tree | 5843801e0024ec06a820ecae321239692ad23a68 | |
| parent | 6a2c2f8d34fa1e8f3bb85d159d354810ed63692e (diff) | |
| download | git-5621760f59c0655e41045c3141deef9791858916.tar.gz | |
fix minor typosrg/a-the-typo
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: René Genz <liebundartig@freenet.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-commit.txt | 4 | ||||
| -rw-r--r-- | Documentation/gitremote-helpers.txt | 2 | ||||
| -rwxr-xr-x | ci/run-windows-build.sh | 2 | ||||
| -rw-r--r-- | diff.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index ed0f5b94b3..afb06adba4 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 e4b785eb60..4a584f3c5d 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 4e3a50b60e..9f89d54320 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. @@ -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 |