Skip to content

Commit 9cdd15c

Browse files
bertyuangitster
authored andcommitted
docs: fix typos and grammar
Fix several spelling mistakes, subject-verb agreement issues, and duplicated words. Signed-off-by: Weijie Yuan <wy@wyuan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 94f0577 commit 9cdd15c

14 files changed

Lines changed: 14 additions & 14 deletions

Documentation/fetch-options.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
`--all`::
22
`--no-all`::
3-
Fetch all remotes, except for the ones that has the
3+
Fetch all remotes, except for the ones that have the
44
`remote.<name>.skipFetchAll` configuration variable set.
55
This overrides the configuration variable `fetch.all`.
66

combine-diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
666666
* (-) line, which records from what parents the line
667667
* was removed; this line does not appear in the result.
668668
* then check the set of parents the result has difference
669-
* from, from all lines. If there are lines that has
669+
* from, from all lines. If there are lines that have
670670
* different set of parents that the result has differences
671671
* from, that means we have more than two versions.
672672
*

contrib/subtree/t/t7900-subtree.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ test_create_pre2_32_repo () {
7575
#
7676
# Create a simple subtree on a new branch named ORPHAN in REPO.
7777
# The subtree is then merged into the current branch of REPO,
78-
# under PREFIX. The generated subtree has has one commit
78+
# under PREFIX. The generated subtree has one commit
7979
# with subject and tag FILENAME with a single file "FILENAME.t"
8080
#
8181
# When this method returns:

csum-file.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct hashfd_options {
5252
*/
5353
struct progress *progress;
5454

55-
/* The length of the buffer that shall be used read read data. */
55+
/* The length of the buffer that shall be used to read data. */
5656
size_t buffer_len;
5757
};
5858

delta-islands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void free_island_marks(void)
527527
kh_destroy_oid_map(island_marks);
528528
}
529529

530-
/* detect use-after-free with a an address which is never valid: */
530+
/* detect use-after-free with an address which is never valid: */
531531
island_marks = (void *)-1;
532532
}
533533

diffcore-pickaxe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static void pickaxe(struct diff_queue_struct *q, struct diff_options *o,
203203
for (i = 0; i < q->nr; i++)
204204
diff_free_filepair(q->queue[i]);
205205
} else {
206-
/* Showing only the filepairs that has the needle */
206+
/* Showing only the filepairs that have the needle */
207207
for (i = 0; i < q->nr; i++) {
208208
struct diff_filepair *p = q->queue[i];
209209
if (pickaxe_match(p, o, regexp, kws, fn))

odb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct object_database {
5757
struct repository *repo;
5858

5959
/*
60-
* State of current current object database transaction. Only one
60+
* State of current object database transaction. Only one
6161
* transaction may be pending at a time. Is NULL when no transaction is
6262
* configured.
6363
*/

parse-options.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
11491149
(ctx->flags & PARSE_OPT_KEEP_UNKNOWN_OPT)) {
11501150
/*
11511151
* Found an unknown option given to a command with
1152-
* subcommands that has a default operation mode:
1152+
* subcommands that have a default operation mode:
11531153
* we treat this option and all remaining args as
11541154
* arguments meant to that default operation mode.
11551155
* So we are done parsing.

rerere.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ static int check_one_conflict(struct index_state *istate, int i, int *type)
548548

549549
/*
550550
* Scan the index and find paths that have conflicts that rerere can
551-
* handle, i.e. the ones that has both stages #2 and #3.
551+
* handle, i.e. the ones that have both stages #2 and #3.
552552
*
553553
* NEEDSWORK: we do not record or replay a previous "resolve by
554554
* deletion" for a delete-modify conflict, as that is inherently risky

t/t4203-mailmap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ test_expect_success 'mailmap.file set' '
180180
git shortlog HEAD >actual &&
181181
test_cmp expect actual &&
182182
183-
# The internal_mailmap/.mailmap file is an a subdirectory, but
183+
# The internal_mailmap/.mailmap file is in a subdirectory, but
184184
# as shown here it can also be outside the repository
185185
test_when_finished "rm -rf sub-repo" &&
186186
git clone . sub-repo &&

0 commit comments

Comments
 (0)