diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:35 -0800 |
| commit | d3096d2ba68aa6814d531317433f1cdcd76ba55c (patch) | |
| tree | bd4aee07adf43114a4501a2cb187ffc8629cfcc0 /builtin | |
| parent | Merge branch 'ns/test-desc-typofix' (diff) | |
| parent | Fix spelling errors in no-longer-updated-from-upstream modules (diff) | |
| download | git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.tar.gz git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.zip | |
Merge branch 'en/doc-typofix'
Docfix.
* en/doc-typofix:
Fix spelling errors in no-longer-updated-from-upstream modules
multimail: fix a few simple spelling errors
sha1dc: fix trivial comment spelling error
Fix spelling errors in test commands
Fix spelling errors in messages shown to users
Fix spelling errors in names of tests
Fix spelling errors in comments of testcases
Fix spelling errors in code comments
Fix spelling errors in documentation outside of Documentation/
Documentation: fix a bunch of typos, both old and new
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rw-r--r-- | builtin/gc.c | 4 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index bc750b61d1..256a6a61ab 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1403,7 +1403,7 @@ static int do_fetch(struct transport *transport, /* * We're setting the upstream configuration for the - * current branch. The relevent upstream is the + * current branch. The relevant upstream is the * fetched branch that is meant to be merged with the * current one, i.e. the one fetched to FETCH_HEAD. * diff --git a/builtin/gc.c b/builtin/gc.c index fadb45489f..3f76bf4aa7 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -458,7 +458,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) /* * Returns 0 if there was no previous error and gc can proceed, 1 if * gc should not proceed due to an error in the last run. Prints a - * message and returns -1 if an error occured while reading gc.log + * message and returns -1 if an error occurred while reading gc.log */ static int report_last_gc_error(void) { @@ -601,7 +601,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (detach_auto) { int ret = report_last_gc_error(); if (ret < 0) - /* an I/O error occured, already reported */ + /* an I/O error occurred, already reported */ exit(128); if (ret == 1) /* Last gc --auto failed. Skip this one. */ diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 5876583220..393c20a2d7 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -163,7 +163,7 @@ static void *get_delta(struct object_entry *entry) delta_buf = diff_delta(base_buf, base_size, buf, size, &delta_size, 0); /* - * We succesfully computed this delta once but dropped it for + * We successfully computed this delta once but dropped it for * memory reasons. Something is very wrong if this time we * recompute and create a different delta. */ |