Merge branch 'rg/a-the-typo'

Typofix.

* rg/a-the-typo:
  fix minor typos
This commit is contained in:
Junio C Hamano 2017-05-04 16:26:47 +09:00
commit 7c7478f45a
4 changed files with 5 additions and 5 deletions

View file

@ -95,7 +95,7 @@ OPTIONS
--reset-author:: --reset-author::
When used with -C/-c/--amend options, or when committing after a 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 resulting commit now belongs to the committer. This also renews
the author timestamp. the author timestamp.
@ -112,7 +112,7 @@ OPTIONS
`--dry-run`. `--dry-run`.
--long:: --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`. Implies `--dry-run`.
-z:: -z::

View file

@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.
GPG sign pushes. GPG sign pushes.
'option push-option <string>:: '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. must not contain LF or NUL characters, the string is not encoded.
SEE ALSO SEE ALSO

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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. # Set the $GFW_CI_TOKEN as environment variable.
# Pass the branch (only branches on https://github.com/git/git are # Pass the branch (only branches on https://github.com/git/git are
# supported) and a commit hash. # supported) and a commit hash.

2
diff.c
View file

@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,
/* /*
* '--color-words' algorithm can be described as: * '--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; * minus-lines and plus-lines;
* *
* 2. break both minus-lines and plus-lines into words and * 2. break both minus-lines and plus-lines into words and