Merge branch 'rg/a-the-typo'

gitster · gitster · commit 7c7478f45a67 · 2017-05-04T16:26:47.000+09:00
Typofix.

* rg/a-the-typo:
  fix minor typos
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`	`#`
`3`		`-# Script to trigger the a Git for Windows build and test run.`
	`3`	`+# Script to trigger the Git for Windows build and test run.`
`4`	`4`	`# Set the $GFW_CI_TOKEN as environment variable.`
`5`	`5`	`# Pass the branch (only branches on https://github.com/git/git are`
`6`	`6`	`# supported) and a commit hash.`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,`
`911`	`911`	`/*`
`912`	`912`	`* '--color-words' algorithm can be described as:`
`913`	`913`	`*`
`914`		`- * 1. collect a the minus/plus lines of a diff hunk, divided into`
	`914`	`+ * 1. collect the minus/plus lines of a diff hunk, divided into`
`915`	`915`	`* minus-lines and plus-lines;`
`916`	`916`	`*`
`917`	`917`	`* 2. break both minus-lines and plus-lines into words and`