Merge branch 'tf/commit-list-prefix'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9d6c880e1823ceb0689d8c26c8965878e3015506..803da09a126ad75ad3578a90d117e13cef48ba46 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1875,30 +1875,50 @@ _git_config ()
                ;;
        esac
        __gitcomp "
-               add.ignore-errors
+               add.ignoreErrors
+               advice.commitBeforeMerge
+               advice.detachedHead
+               advice.implicitIdentity
+               advice.pushNonFastForward
+               advice.resolveConflict
+               advice.statusHints
                alias.
+               am.keepcr
                apply.ignorewhitespace
                apply.whitespace
                branch.autosetupmerge
                branch.autosetuprebase
+               browser.
                clean.requireForce
                color.branch
                color.branch.current
                color.branch.local
                color.branch.plain
                color.branch.remote
+               color.decorate.HEAD
+               color.decorate.branch
+               color.decorate.remoteBranch
+               color.decorate.stash
+               color.decorate.tag
                color.diff
                color.diff.commit
                color.diff.frag
+               color.diff.func
                color.diff.meta
                color.diff.new
                color.diff.old
                color.diff.plain
                color.diff.whitespace
                color.grep
-               color.grep.external
+               color.grep.context
+               color.grep.filename
+               color.grep.function
+               color.grep.linenumber
                color.grep.match
+               color.grep.selected
+               color.grep.separator
                color.interactive
+               color.interactive.error
                color.interactive.header
                color.interactive.help
                color.interactive.prompt
@@ -1912,21 +1932,29 @@ _git_config ()
                color.status.untracked
                color.status.updated
                color.ui
+               commit.status
                commit.template
+               core.abbrevguard
+               core.askpass
+               core.attributesfile
                core.autocrlf
                core.bare
+               core.bigFileThreshold
                core.compression
                core.createObject
                core.deltaBaseCacheLimit
                core.editor
+               core.eol
                core.excludesfile
                core.fileMode
                core.fsyncobjectfiles
                core.gitProxy
                core.ignoreCygwinFSTricks
                core.ignoreStat
+               core.ignorecase
                core.logAllRefUpdates
                core.loosecompression
+               core.notesRef
                core.packedGitLimit
                core.packedGitWindowSize
                core.pager
@@ -1936,6 +1964,7 @@ _git_config ()
                core.repositoryFormatVersion
                core.safecrlf
                core.sharedRepository
+               core.sparseCheckout
                core.symlinks
                core.trustctime
                core.warnAmbiguousRefs
@@ -1943,15 +1972,17 @@ _git_config ()
                core.worktree
                diff.autorefreshindex
                diff.external
+               diff.ignoreSubmodules
                diff.mnemonicprefix
+               diff.noprefix
                diff.renameLimit
-               diff.renameLimit.
                diff.renames
                diff.suppressBlankEmpty
                diff.tool
                diff.wordRegex
                difftool.
                difftool.prompt
+               fetch.recurseSubmodules
                fetch.unpackLimit
                format.attach
                format.cc
@@ -1963,6 +1994,8 @@ _git_config ()
                format.subjectprefix
                format.suffix
                format.thread
+               format.to
+               gc.
                gc.aggressiveWindow
                gc.auto
                gc.autopacklimit
@@ -2000,15 +2033,20 @@ _git_config ()
                http.lowSpeedLimit
                http.lowSpeedTime
                http.maxRequests
+               http.minSessions
                http.noEPSV
+               http.postBuffer
                http.proxy
                http.sslCAInfo
                http.sslCAPath
                http.sslCert
+               http.sslCertPasswordProtected
                http.sslKey
                http.sslVerify
+               http.useragent
                i18n.commitEncoding
                i18n.logOutputEncoding
+               imap.authMethod
                imap.folder
                imap.host
                imap.pass
@@ -2017,6 +2055,7 @@ _git_config ()
                imap.sslverify
                imap.tunnel
                imap.user
+               init.templatedir
                instaweb.browser
                instaweb.httpd
                instaweb.local
@@ -2024,19 +2063,29 @@ _git_config ()
                instaweb.port
                interactive.singlekey
                log.date
+               log.decorate
                log.showroot
                mailmap.file
                man.
                man.viewer
+               merge.
                merge.conflictstyle
                merge.log
                merge.renameLimit
+               merge.renormalize
                merge.stat
                merge.tool
                merge.verbosity
                mergetool.
                mergetool.keepBackup
+               mergetool.keepTemporaries
                mergetool.prompt
+               notes.displayRef
+               notes.rewrite.
+               notes.rewrite.amend
+               notes.rewrite.rebase
+               notes.rewriteMode
+               notes.rewriteRef
                pack.compression
                pack.deltaCacheLimit
                pack.deltaCacheSize
@@ -2047,31 +2096,42 @@ _git_config ()
                pack.window
                pack.windowMemory
                pager.
+               pretty.
                pull.octopus
                pull.twohead
                push.default
+               rebase.autosquash
                rebase.stat
+               receive.autogc
                receive.denyCurrentBranch
+               receive.denyDeleteCurrent
                receive.denyDeletes
                receive.denyNonFastForwards
                receive.fsckObjects
                receive.unpackLimit
+               receive.updateserverinfo
+               remotes.
                repack.usedeltabaseoffset
                rerere.autoupdate
                rerere.enabled
+               sendemail.
                sendemail.aliasesfile
-               sendemail.aliasesfiletype
+               sendemail.aliasfiletype
                sendemail.bcc
                sendemail.cc
                sendemail.cccmd
                sendemail.chainreplyto
                sendemail.confirm
                sendemail.envelopesender
+               sendemail.from
+               sendemail.identity
                sendemail.multiedit
                sendemail.signedoffbycc
+               sendemail.smtpdomain
                sendemail.smtpencryption
                sendemail.smtppass
                sendemail.smtpserver
+               sendemail.smtpserveroption
                sendemail.smtpserverport
                sendemail.smtpuser
                sendemail.suppresscc
@@ -2082,6 +2142,8 @@ _git_config ()
                showbranch.default
                status.relativePaths
                status.showUntrackedFiles
+               status.submodulesummary
+               submodule.
                tar.umask
                transfer.unpackLimit
                url.