diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:40 -0700 |
| commit | 4861bbf85a1265c6a0e939674bb4441e748d5542 (patch) | |
| tree | 250a9e77608cbfc68446105261e1f8b9a3e15b84 | |
| parent | 8895aca99693e22ec4856744d5b2c25b8736a111 (diff) | |
| parent | 686f3337a6a96c317c42f08b1be2329d5ae4fe4f (diff) | |
| download | git-4861bbf85a1265c6a0e939674bb4441e748d5542.tar.gz | |
Merge branch 'ak/typofix-2.46-maint'
Typofixes.
* ak/typofix-2.46-maint:
perl: fix a typo
mergetool: fix a typo
reftable: fix a typo
trace2: fix typos
| -rw-r--r-- | mergetools/vimdiff | 2 | ||||
| -rw-r--r-- | perl/Git/I18N.pm | 2 | ||||
| -rw-r--r-- | reftable/reader.h | 2 | ||||
| -rw-r--r-- | trace2/tr2_ctr.c | 2 | ||||
| -rw-r--r-- | trace2/tr2_tls.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index f8ad6b35d4..ffc9be86c8 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -411,7 +411,7 @@ merge_cmd () { -f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"' else # If there is no BASE (example: a merge conflict in a new file - # with the same name created in both braches which didn't exist + # with the same name created in both branches which didn't exist # before), close all BASE windows using vim's "quit" command FINAL_CMD=$(echo "$FINAL_CMD" | \ diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm index 5454c3a6d2..475e90a6df 100644 --- a/perl/Git/I18N.pm +++ b/perl/Git/I18N.pm @@ -111,7 +111,7 @@ L<Locale::Messages>'s ngettext function or passthrough fallback function. =head2 N__($) No-operation that only returns its argument. Use this if you want xgettext to -extract the text to the pot template but do not want to trigger retrival of the +extract the text to the pot template but do not want to trigger retrieval of the translation at run time. =head1 AUTHOR diff --git a/reftable/reader.h b/reftable/reader.h index 3710ee09b4..91377b9ce5 100644 --- a/reftable/reader.h +++ b/reftable/reader.h @@ -30,7 +30,7 @@ struct reftable_reader_offsets { /* The state for reading a reftable file. */ struct reftable_reader { - /* for convience, associate a name with the instance. */ + /* for convenience, associate a name with the instance. */ char *name; struct reftable_block_source source; diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c index 036b643578..ee17bfa86b 100644 --- a/trace2/tr2_ctr.c +++ b/trace2/tr2_ctr.c @@ -4,7 +4,7 @@ #include "trace2/tr2_ctr.h" /* - * A global counter block to aggregrate values from the partial sums + * A global counter block to aggregate values from the partial sums * from each thread. */ static struct tr2_counter_block final_counter_block; /* access under tr2tls_mutex */ diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h index 3dfe6557fc..3bdbf4d275 100644 --- a/trace2/tr2_tls.h +++ b/trace2/tr2_tls.h @@ -11,7 +11,7 @@ */ /* - * Arbitry limit for thread names for column alignment. + * Arbitrary limit for thread names for column alignment. */ #define TR2_MAX_THREAD_NAME (24) |