From 23925a153deec68f1f0b8d9d68560a54cfe5b180 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 3 Oct 2024 01:38:12 +0300 Subject: [PATCH 1/4] trace2: fix typos Fix typos in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- trace2/tr2_ctr.c | 2 +- trace2/tr2_tls.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c index d3a33715c1..bdf78ed8f3 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) From a54601c38b2ca24ae5a2f15906618fc61e24be78 Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 3 Oct 2024 01:38:13 +0300 Subject: [PATCH 2/4] reftable: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- reftable/reader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reftable/reader.h b/reftable/reader.h index e869165f23..8d69ff3d0e 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; From 2c1070c75869fd658a6aab066c380044b5c1a5ca Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 3 Oct 2024 01:38:14 +0300 Subject: [PATCH 3/4] mergetool: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- mergetools/vimdiff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" | \ From 686f3337a6a96c317c42f08b1be2329d5ae4fe4f Mon Sep 17 00:00:00 2001 From: Andrew Kreimer Date: Thu, 3 Oct 2024 01:38:16 +0300 Subject: [PATCH 4/4] perl: fix a typo Fix a typo in comments. Signed-off-by: Andrew Kreimer Signed-off-by: Junio C Hamano --- perl/Git/I18N.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ =head2 __n($$$) =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