Merge branch 'rr/maint-submodule-unknown-cmd' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d743e56d18951da435d8ffe282c06450f2dfac39..5b255cba69661a2f4d5b6cfa9dbc6a171c5f91ee 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2033,7 +2033,7 @@ _git_config ()
 
 _git_remote ()
 {
-       local subcommands="add rename rm set-head set-branches set-url show prune update"
+       local subcommands="add rename remove set-head set-branches set-url show prune update"
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"
@@ -2041,7 +2041,7 @@ _git_remote ()
        fi
 
        case "$subcommand" in
-       rename|rm|set-url|show|prune)
+       rename|remove|set-url|show|prune)
                __gitcomp_nl "$(__git_remotes)"
                ;;
        set-head|set-branches)