Skip to content

Commit

Permalink
fix minor typos
Browse files Browse the repository at this point in the history
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: René Genz <liebundartig@freenet.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
realsobek authored and gitster committed May 1, 2017
1 parent 6a2c2f8 commit 5621760
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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::
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gitremote-helpers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/run-windows-build.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5621760

Please sign in to comment.