From: Junio C Hamano <gitster@pobox.com>
To: Samanta Navarro <ferivoz@riseup.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] maintenance: fix typos
Date: Sat, 31 Dec 2022 11:07:27 +0900 [thread overview]
Message-ID: <xmqqpmc0iaw0.fsf@gitster.g> (raw)
In-Reply-To: <20221229125012.cp5tjdlnvxbln44l@localhost> (Samanta Navarro's message of "Thu, 29 Dec 2022 12:50:12 +0000")
Samanta Navarro <ferivoz@riseup.net> writes:
[continuing from <xmqqmt75lh2r.fsf@gitster.g>; this is second part]
Starting from here
> diff --git a/bloom.h b/bloom.h
> index adde6dfe21..83eb989d85 100644
> --- a/bloom.h
> +++ b/bloom.h
> @@ -15,7 +15,7 @@ struct bloom_filter_settings {
> - * number of bit positions tht cumulatively
> + * number of bit positions that cumulatively
... down to here ...
> diff --git a/contrib/coccinelle/unused.cocci b/contrib/coccinelle/unused.cocci
> index d84046f82e..142a5a1f02 100644
> --- a/contrib/coccinelle/unused.cocci
> +++ b/contrib/coccinelle/unused.cocci
> @@ -1,4 +1,4 @@
> -// This rule finds sequences of "unused" declerations and uses of a
> +// This rule finds sequences of "unused" declarations and uses of a
look all good.
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index dc95c34cc8..f414639f52 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -3330,7 +3330,7 @@ _git_worktree ()
> # Here we are not completing an --option, it's either the
> # path or a ref.
> case "$prev" in
> - -b|-B) # Complete refs for branch to be created/reseted.
> + -b|-B) # Complete refs for branch to be created/resetted.
Past Participle of verb "reset" is "reset", not "resetted", so
... to be created or reset.
I think.
Restarting from here ...
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index 10c9c87839..8c4e2c0460 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -921,7 +921,7 @@ cmd_split () {
> - die "fatal: you must provide exactly one revision, and optionnally a repository. Got: '$*'"
> + die "fatal: you must provide exactly one revision, and optionally a repository. Got: '$*'"
... down to here ..
> diff --git a/fsmonitor.c b/fsmonitor.c
> index 08af00c738..d48e089c9b 100644
> --- a/fsmonitor.c
> +++ b/fsmonitor.c
> @@ -215,7 +215,7 @@ static void fsmonitor_refresh_callback(struct index_s
> - * We need to remove the traling "/" from the path
> + * We need to remove the trailing "/" from the path
look all good.
> diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
> index f43d84e54f..68c999a9be 100644
> --- a/git-gui/lib/themed.tcl
> +++ b/git-gui/lib/themed.tcl
> @@ -4,7 +4,7 @@
> - # Preffered way to set widget colors is using add_option.
> + # Preferred way to set widget colors is using add_option.
Good, but patches to this part of the tree should be against
https://github.com/prati0100/git-gui.git
not my tree (they are rooted differently).
Restarting again from here ...
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index c68f49454c..652d0b2dd3 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -612,7 +612,7 @@ python_conf() {
> - # This asumes that python is in user's $PATH
> + # This assumes that python is in user's $PATH
... down to here ...
> diff --git a/gpg-interface.c b/gpg-interface.c
> index f877a1ea56..89c2ec08be 100644
> --- a/gpg-interface.c
> +++ b/gpg-interface.c
> @@ -379,7 +379,7 @@ static void parse_ssh_output(struct signature_check *sigc)
> - * string. By finding the last occurence of " with ", we can
> + * string. By finding the last occurrence of " with ", we can
all look good. I'd stop here for now.
Thanks.
prev parent reply other threads:[~2022-12-31 2:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-29 12:50 [PATCH] maintenance: fix typos Samanta Navarro
2022-12-30 3:13 ` Junio C Hamano
2022-12-30 11:59 ` Samanta Navarro
2022-12-31 2:07 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpmc0iaw0.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ferivoz@riseup.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).