fix minor typos
Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: René Genz <liebundartig@freenet.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Genz committed
Apr 30, 2017 at 17:48 UTC
5621760f59c0655e41045c3141deef9791858916
4 files changed
+5
-5
Documentation/git-commit.txt
+2
-2
@@ -95,7 +95,7 @@ OPTIONS
95
96
--reset-author::
97
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
99
resulting commit now belongs to the committer. This also renews
100
the author timestamp.
101
@@ -112,7 +112,7 @@ OPTIONS
112
`--dry-run`.
113
114
--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.
116
Implies `--dry-run`.
117
118
-z::
Documentation/gitremote-helpers.txt
+1
-1
@@ -463,7 +463,7 @@ set by Git if the remote helper has the 'option' capability.
463
GPG sign pushes.
464
465
'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
467
must not contain LF or NUL characters, the string is not encoded.
468
469
SEE ALSO
ci/run-windows-build.sh
+1
-1
@@ -1,6 +1,6 @@
1
#!/usr/bin/env bash
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
# Set the $GFW_CI_TOKEN as environment variable.
5
# Pass the branch (only branches on https://github.com/git/git are
6
# supported) and a commit hash.
diff.c
+1
-1
@@ -911,7 +911,7 @@ static int fn_out_diff_words_write_helper(FILE *fp,
911
/*
912
* '--color-words' algorithm can be described as:
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
* minus-lines and plus-lines;
916
*
917
* 2. break both minus-lines and plus-lines into words and