{"thread":{"id":"45777","subject":"[PATCH] fix minor typing mistakes","startedAt":"2017-04-23T14:00:09Z","lastAt":"2017-04-24T02:28:15Z","messageCount":2,"participants":["René Genz","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"317559","messageId":"1492955809-29018-1-git-send-email-liebundartig@freenet.de","threadId":"45777","inReplyTo":null,"subject":"[PATCH] fix minor typing mistakes","fromName":"René Genz","fromEmail":"liebundartig@freenet.de","sentAt":"2017-04-23T13:56:49Z","receivedAt":"2017-04-23T14:00:09Z","isPatch":true,"sender":{"key":"liebundartig@freenet.de","avatar":"https://avatars.githubusercontent.com/u/18424198?v=4"},"body":"Thanks-to: Stefan Beller <sbeller@google.com>\n---\n Documentation/git-commit.txt        | 4 ++--\n Documentation/gitremote-helpers.txt | 2 +-\n ci/run-windows-build.sh             | 2 +-\n diff.c                              | 2 +-\n 4 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex ed0f5b9..afb06ad 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -95,7 +95,7 @@ OPTIONS\n \n --reset-author::\n \tWhen used with -C/-c/--amend options, or when committing after a\n-\ta conflicting cherry-pick, declare that the authorship of the\n+\tconflicting cherry-pick, declare that the authorship of the\n \tresulting commit now belongs to the committer. This also renews\n \tthe author timestamp.\n \n@@ -112,7 +112,7 @@ OPTIONS\n \t`--dry-run`.\n \n --long::\n-\tWhen doing a dry-run, give the output in a the long-format.\n+\tWhen doing a dry-run, give the output in the long-format.\n \tImplies `--dry-run`.\n \n -z::\ndiff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt\nindex e4b785e..4a584f3 100644\n--- a/Documentation/gitremote-helpers.txt\n+++ b/Documentation/gitremote-helpers.txt\n@@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.\n \tGPG sign pushes.\n \n 'option push-option <string>::\n-\tTransmit <string> as a push option. As the a push option\n+\tTransmit <string> as a push option. As the push option\n \tmust not contain LF or NUL characters, the string is not encoded.\n \n SEE ALSO\ndiff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh\nindex 4e3a50b..9f89d54 100755\n--- a/ci/run-windows-build.sh\n+++ b/ci/run-windows-build.sh\n@@ -1,6 +1,6 @@\n #!/usr/bin/env bash\n #\n-# Script to trigger the a Git for Windows build and test run.\n+# Script to trigger the Git for Windows build and test run.\n # Set the $GFW_CI_TOKEN as environment variable.\n # Pass the branch (only branches on https://github.com/git/git are\n # supported) and a commit hash.\ndiff --git a/diff.c b/diff.c\nindex 11eef1c..74283d9 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,\n /*\n  * '--color-words' algorithm can be described as:\n  *\n- *   1. collect a the minus/plus lines of a diff hunk, divided into\n+ *   1. collect the minus/plus lines of a diff hunk, divided into\n  *      minus-lines and plus-lines;\n  *\n  *   2. break both minus-lines and plus-lines into words and\n-- \n1.9.1\n\n"},{"id":"317630","messageId":"xmqqa87635fr.fsf@gitster.mtv.corp.google.com","threadId":"45777","inReplyTo":"1492955809-29018-1-git-send-email-liebundartig@freenet.de","subject":"Re: [PATCH] fix minor typing mistakes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-04-24T02:28:08Z","receivedAt":"2017-04-24T02:28:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Genz <liebundartig@freenet.de> writes:\n\n> Thanks-to: Stefan Beller <sbeller@google.com>\n> ---\n\nIt is nice to give credit to where credit is due (it is more common\nto say Helped-by: around here, though), but don't forget to sign off\nyour patch yourself ;-)  IOW\n\n    Helped-by: Stefan Beller <sbeller@google.com>\n    Signed-off-by: René Genz <liebundartig@freenet.de>\n\n>  Documentation/git-commit.txt        | 4 ++--\n>  Documentation/gitremote-helpers.txt | 2 +-\n>  ci/run-windows-build.sh             | 2 +-\n>  diff.c                              | 2 +-\n>  4 files changed, 5 insertions(+), 5 deletions(-)\n\nThis \"a the\" and \"the a\" seem to be quite a popular typo.  Thanks\nfor catching them.\n\n> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\n> index ed0f5b9..afb06ad 100644\n> --- a/Documentation/git-commit.txt\n> +++ b/Documentation/git-commit.txt\n> @@ -95,7 +95,7 @@ OPTIONS\n>  \n>  --reset-author::\n>  \tWhen used with -C/-c/--amend options, or when committing after a\n> -\ta conflicting cherry-pick, declare that the authorship of the\n> +\tconflicting cherry-pick, declare that the authorship of the\n>  \tresulting commit now belongs to the committer. This also renews\n>  \tthe author timestamp.\n>  \n> @@ -112,7 +112,7 @@ OPTIONS\n>  \t`--dry-run`.\n>  \n>  --long::\n> -\tWhen doing a dry-run, give the output in a the long-format.\n> +\tWhen doing a dry-run, give the output in the long-format.\n>  \tImplies `--dry-run`.\n>  \n>  -z::\n> diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt\n> index e4b785e..4a584f3 100644\n> --- a/Documentation/gitremote-helpers.txt\n> +++ b/Documentation/gitremote-helpers.txt\n> @@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.\n>  \tGPG sign pushes.\n>  \n>  'option push-option <string>::\n> -\tTransmit <string> as a push option. As the a push option\n> +\tTransmit <string> as a push option. As the push option\n>  \tmust not contain LF or NUL characters, the string is not encoded.\n>  \n>  SEE ALSO\n> diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh\n> index 4e3a50b..9f89d54 100755\n> --- a/ci/run-windows-build.sh\n> +++ b/ci/run-windows-build.sh\n> @@ -1,6 +1,6 @@\n>  #!/usr/bin/env bash\n>  #\n> -# Script to trigger the a Git for Windows build and test run.\n> +# Script to trigger the Git for Windows build and test run.\n>  # Set the $GFW_CI_TOKEN as environment variable.\n>  # Pass the branch (only branches on https://github.com/git/git are\n>  # supported) and a commit hash.\n> diff --git a/diff.c b/diff.c\n> index 11eef1c..74283d9 100644\n> --- a/diff.c\n> +++ b/diff.c\n> @@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,\n>  /*\n>   * '--color-words' algorithm can be described as:\n>   *\n> - *   1. collect a the minus/plus lines of a diff hunk, divided into\n> + *   1. collect the minus/plus lines of a diff hunk, divided into\n>   *      minus-lines and plus-lines;\n>   *\n>   *   2. break both minus-lines and plus-lines into words and\n"}]}