Merge branch 'rf/completion'

Completion updates.

* rf/completion:
completion: add git config credentialCache.ignoreSIGHUP
completion: add git config credential completions
completion: add git config advice completions
completion: add git config am.threeWay completion
completion: add git config core completions
completion: add git config gc completions

diff --combined contrib/completion/git-completion.bash
index 15b40f877489ff43714e9cfce87f06543891b8f6,d18d30b7775c89efea7f43b88aeab0073bfed2f5..48a2f26622d992b89462edb3658b5cdccee806bc
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1319,7 -1319,6 +1319,7 @@@ _git_clone (
                        --template=
                        --depth
                        --single-branch
 +                      --no-tags
                        --branch
                        --recurse-submodules
                        --no-single-branch
@@@ -2336,14 -2335,23 +2336,23 @@@ _git_config (
        esac
        __gitcomp "
                add.ignoreErrors
+               advice.amWorkDir
                advice.commitBeforeMerge
                advice.detachedHead
                advice.implicitIdentity
-               advice.pushNonFastForward
+               advice.pushAlreadyExists
+               advice.pushFetchFirst
+               advice.pushNeedsForce
+               advice.pushNonFFCurrent
+               advice.pushNonFFMatching
+               advice.pushUpdateRejected
                advice.resolveConflict
+               advice.rmHints
                advice.statusHints
+               advice.statusUoption
                alias.
                am.keepcr
+               am.threeWay
                apply.ignorewhitespace
                apply.whitespace
                branch.autosetupmerge
@@@ -2388,9 -2396,7 +2397,9 @@@
                color.status.added
                color.status.changed
                color.status.header
 +              color.status.localBranch
                color.status.nobranch
 +              color.status.remoteBranch
                color.status.unmerged
                color.status.untracked
                color.status.updated
@@@ -2406,6 -2412,8 +2415,8 @@@
                core.autocrlf
                core.bare
                core.bigFileThreshold
+               core.checkStat
+               core.commentChar
                core.compression
                core.createObject
                core.deltaBaseCacheLimit
@@@ -2415,6 -2423,8 +2426,8 @@@
                core.fileMode
                core.fsyncobjectfiles
                core.gitProxy
+               core.hideDotFiles
+               core.hooksPath
                core.ignoreStat
                core.ignorecase
                core.logAllRefUpdates
@@@ -2422,20 -2432,30 +2435,30 @@@
                core.notesRef
                core.packedGitLimit
                core.packedGitWindowSize
+               core.packedRefsTimeout
                core.pager
+               core.precomposeUnicode
                core.preferSymlinkRefs
                core.preloadindex
+               core.protectHFS
+               core.protectNTFS
                core.quotepath
                core.repositoryFormatVersion
                core.safecrlf
                core.sharedRepository
                core.sparseCheckout
+               core.splitIndex
+               core.sshCommand
                core.symlinks
                core.trustctime
                core.untrackedCache
                core.warnAmbiguousRefs
                core.whitespace
                core.worktree
+               credential.helper
+               credential.useHttpPath
+               credential.username
+               credentialCache.ignoreSIGHUP
                diff.autorefreshindex
                diff.external
                diff.ignoreSubmodules
@@@ -2467,15 -2487,19 +2490,19 @@@
                format.thread
                format.to
                gc.
+               gc.aggressiveDepth
                gc.aggressiveWindow
                gc.auto
+               gc.autoDetach
                gc.autopacklimit
+               gc.logExpiry
                gc.packrefs
                gc.pruneexpire
                gc.reflogexpire
                gc.reflogexpireunreachable
                gc.rerereresolved
                gc.rerereunresolved
+               gc.worktreePruneExpire
                gitcvs.allbinary
                gitcvs.commitmsgannotation
                gitcvs.dbTableNamePrefix
@@@ -2816,7 -2840,7 +2843,7 @@@ _git_show_branch (
  _git_stash ()
  {
        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 subcommands='push save list show apply clear drop pop create branch'
        local subcommand="$(__git_find_on_cmdline "$subcommands")"
        if [ -z "$subcommand" ]; then
                case "$cur" in
@@@ -2831,9 -2855,6 +2858,9 @@@
                esac
        else
                case "$subcommand,$cur" in
 +              push,--*)
 +                      __gitcomp "$save_opts --message"
 +                      ;;
                save,--*)
                        __gitcomp "$save_opts"
                        ;;