contrib: fix typos

Fix typos via codespell.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 60a22d619a85cc17334ef2e73185048120d3e51f..3d4dff3185ca957731e95379647bfd9bb90b37c6 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3296,7 +3296,7 @@ __gitcomp_directories ()
                #       i.e. which are *already* part of their
                #       sparse-checkout.  Thus, normal file and directory
                #       completion is always useless for "git
-               #       sparse-checkout add" and is also probelmatic for
+               #       sparse-checkout add" and is also problematic for
                #       "git sparse-checkout set" unless using it to
                #       strictly narrow the checkout.
                COMPREPLY=( "" )
@@ -3698,7 +3698,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/reset.
                        __git_complete_refs
                        ;;
                -*)     # The previous word is an -o|--option without an

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 5dab3f506c6e0877740f7d3990388b3975e877c5..15ae86db1b277a8be125a055b40daffc98277994 100755 (executable)
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -946,7 +946,7 @@ cmd_split () {
                rev=$(git rev-parse -q --verify "$1^{commit}") ||
                        die "fatal: '$1' does not refer to a commit"
        else
-               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: '$*'"
        fi
        repository=""
        if test "$#" = 2

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index c3bd2a58b941f0bda8673a707fb0da71e4cbca88..3c6103f6d27083f43363eca6136aaa12a2a1c1b1 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -47,7 +47,7 @@ last_commit_subject () {
 # pre-2.32.0 versions of 'git subtree' would write the hash of the tag
 # (sub1 below), instead of the commit (sub1^{commit}) in the
 # "git-subtree-split" trailer.
-# We immitate this behaviour below using a replace ref.
+# We imitate this behaviour below using a replace ref.
 # This function creates 3 repositories:
 # - $1
 # - $1-sub (added as subtree "sub" in $1)