Merge branch 'cp/completion-clone-recurse-submodules' into maint

* cp/completion-clone-recurse-submodules:
completion: add option '--recurse-submodules' to 'git clone'

diff --combined contrib/completion/git-completion.bash
index 34024754d9296b56c194a7959afb7b7f28402457,03ace767b4ea3393154ac6ef1c234b771cb7e428..bd25b0a893fc1ff29716a0a6bb1f2215ff1d460c
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -10,7 -10,6 +10,7 @@@
  #    *) local and remote tag names
  #    *) .git/remotes file names
  #    *) git 'subcommands'
 +#    *) git email aliases for git-send-email
  #    *) tree paths within 'ref:path/to/file' expressions
  #    *) file paths within current working directory and index
  #    *) common --long-options
@@@ -1092,6 -1091,7 +1092,7 @@@ _git_clone (
                        --depth
                        --single-branch
                        --branch
+                       --recurse-submodules
                        "
                return
                ;;
@@@ -1169,7 -1169,7 +1170,7 @@@ __git_diff_common_options="--stat --num
                        --no-prefix --src-prefix= --dst-prefix=
                        --inter-hunk-context=
                        --patience --histogram --minimal
 -                      --raw --word-diff
 +                      --raw --word-diff --word-diff-regex=
                        --dirstat --dirstat= --dirstat-by-file
                        --dirstat-by-file= --cumulative
                        --diff-algorithm=
@@@ -1312,7 -1312,6 +1313,7 @@@ _git_grep (
                        --full-name --line-number
                        --extended-regexp --basic-regexp --fixed-strings
                        --perl-regexp
 +                      --threads
                        --files-with-matches --name-only
                        --files-without-match
                        --max-depth
@@@ -1339,15 -1338,15 +1340,15 @@@ _git_help (
  {
        case "$cur" in
        --*)
 -              __gitcomp "--all --info --man --web"
 +              __gitcomp "--all --guides --info --man --web"
                return
                ;;
        esac
        __git_compute_all_commands
        __gitcomp "$__git_all_commands $(__git_aliases)
                attributes cli core-tutorial cvs-migration
 -              diffcore gitk glossary hooks ignore modules
 -              namespaces repository-layout tutorial tutorial-2
 +              diffcore everyday gitk glossary hooks ignore modules
 +              namespaces repository-layout revisions tutorial tutorial-2
                workflows
                "
  }
@@@ -1458,7 -1457,6 +1459,7 @@@ _git_log (
                        --relative-date --date=
                        --pretty= --format= --oneline
                        --show-signature
 +                      --cherry-mark
                        --cherry-pick
                        --graph
                        --decorate --decorate=
@@@ -1689,12 -1687,8 +1690,12 @@@ _git_rebase (
                        --preserve-merges --stat --no-stat
                        --committer-date-is-author-date --ignore-date
                        --ignore-whitespace --whitespace=
 -                      --autosquash --fork-point --no-fork-point
 -                      --autostash
 +                      --autosquash --no-autosquash
 +                      --fork-point --no-fork-point
 +                      --autostash --no-autostash
 +                      --verify --no-verify
 +                      --keep-empty --root --force-rebase --no-ff
 +                      --exec
                        "
  
                return
@@@ -1719,15 -1713,6 +1720,15 @@@ __git_send_email_suppresscc_options="au
  
  _git_send_email ()
  {
 +      case "$prev" in
 +      --to|--cc|--bcc|--from)
 +              __gitcomp "
 +              $(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
 +              "
 +              return
 +              ;;
 +      esac
 +
        case "$cur" in
        --confirm=*)
                __gitcomp "
@@@ -1752,12 -1737,6 +1753,12 @@@
                        " "" "${cur##--thread=}"
                return
                ;;
 +      --to=*|--cc=*|--bcc=*|--from=*)
 +              __gitcomp "
 +              $(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null)
 +              " "" "${cur#--*=}"
 +              return
 +              ;;
        --*)
                __gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
                        --compose --confirm= --dry-run --envelope-sender
@@@ -1814,7 -1793,7 +1815,7 @@@ _git_config (
                return
                ;;
        branch.*.rebase)
 -              __gitcomp "false true"
 +              __gitcomp "false true preserve interactive"
                return
                ;;
        remote.pushdefault)
@@@ -2061,7 -2040,6 +2062,7 @@@
                core.sparseCheckout
                core.symlinks
                core.trustctime
 +              core.untrackedCache
                core.warnAmbiguousRefs
                core.whitespace
                core.worktree
@@@ -2375,7 -2353,7 +2376,7 @@@ _git_show_branch (
        case "$cur" in
        --*)
                __gitcomp "
 -                      --all --remotes --topo-order --current --more=
 +                      --all --remotes --topo-order --date-order --current --more=
                        --list --independent --merge-base --no-name
                        --color --no-color
                        --sha1-name --sparse --topics --reflog
@@@ -2388,7 -2366,7 +2389,7 @@@
  
  _git_stash ()
  {
 -      local save_opts='--keep-index --no-keep-index --quiet --patch'
 +      local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
        local subcommands='save list show apply clear drop pop create branch'
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
@@@ -2410,20 -2388,9 +2411,20 @@@
                apply,--*|pop,--*)
                        __gitcomp "--index --quiet"
                        ;;
 -              show,--*|drop,--*|branch,--*)
 +              drop,--*)
 +                      __gitcomp "--quiet"
 +                      ;;
 +              show,--*|branch,--*)
 +                      ;;
 +              branch,*)
 +                      if [ $cword -eq 3 ]; then
 +                              __gitcomp_nl "$(__git_refs)";
 +                      else
 +                              __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
 +                                              | sed -n -e 's/:.*//p')"
 +                      fi
                        ;;
 -              show,*|apply,*|drop,*|pop,*|branch,*)
 +              show,*|apply,*|drop,*|pop,*)
                        __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
                                        | sed -n -e 's/:.*//p')"
                        ;;