Skip to content

Commit 7c7478f

Browse files
committed
Merge branch 'rg/a-the-typo'
Typofix. * rg/a-the-typo: fix minor typos
2 parents c8ddd2a + 5621760 commit 7c7478f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Documentation/git-commit.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ OPTIONS
9595

9696
--reset-author::
9797
When used with -C/-c/--amend options, or when committing after a
98-
a conflicting cherry-pick, declare that the authorship of the
98+
conflicting cherry-pick, declare that the authorship of the
9999
resulting commit now belongs to the committer. This also renews
100100
the author timestamp.
101101

@@ -112,7 +112,7 @@ OPTIONS
112112
`--dry-run`.
113113

114114
--long::
115-
When doing a dry-run, give the output in a the long-format.
115+
When doing a dry-run, give the output in the long-format.
116116
Implies `--dry-run`.
117117

118118
-z::

Documentation/gitremote-helpers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.
463463
GPG sign pushes.
464464

465465
'option push-option <string>::
466-
Transmit <string> as a push option. As the a push option
466+
Transmit <string> as a push option. As the push option
467467
must not contain LF or NUL characters, the string is not encoded.
468468

469469
SEE ALSO

ci/run-windows-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
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.
44
# Set the $GFW_CI_TOKEN as environment variable.
55
# Pass the branch (only branches on https://github.com/git/git are
66
# supported) and a commit hash.

diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,
911911
/*
912912
* '--color-words' algorithm can be described as:
913913
*
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
915915
* minus-lines and plus-lines;
916916
*
917917
* 2. break both minus-lines and plus-lines into words and

0 commit comments

Comments
 (0)