Merge branch 'rt/completion-help'

Shell completion (in contrib/) updates.

* rt/completion-help:
completion: add 'revisions' and 'everyday' to 'git help'
completion: add option '--guides' to 'git help'

diff --combined contrib/completion/git-completion.bash
index e3918c87e3adf32a9d7a4f0320c92c497376b9b5,71e1fc8b2c2909a71a316710beda9c7369ecaa05..ffe60048c1e50a2b3d9282cbab09721710232fbe
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1312,7 -1312,6 +1312,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 +1339,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
                "
  }
@@@ -1813,7 -1812,7 +1813,7 @@@ _git_config (
                return
                ;;
        branch.*.rebase)
 -              __gitcomp "false true"
 +              __gitcomp "false true preserve interactive"
                return
                ;;
        remote.pushdefault)
@@@ -2060,7 -2059,6 +2060,7 @@@
                core.sparseCheckout
                core.symlinks
                core.trustctime
 +              core.untrackedCache
                core.warnAmbiguousRefs
                core.whitespace
                core.worktree