Merge branch 'tc/completion-reflog'

* tc/completion-reflog:
bash completion: add basic support for git-reflog

diff --combined contrib/completion/git-completion.bash
index 25c431469fc85bcf2fc1089091d6f11821f2f570,9d6c880e1823ceb0689d8c26c8965878e3015506..803da09a126ad75ad3578a90d117e13cef48ba46
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -735,7 -735,6 +735,6 @@@ __git_list_porcelain_commands (
                quiltimport)      : import;;
                read-tree)        : plumbing;;
                receive-pack)     : plumbing;;
-               reflog)           : plumbing;;
                remote-*)         : transport;;
                repo-config)      : deprecated;;
                rerere)           : plumbing;;
@@@ -1632,6 -1631,18 +1631,18 @@@ _git_rebase (
        __gitcomp "$(__git_refs)"
  }
  
+ _git_reflog ()
+ {
+       local subcommands="show delete expire"
+       local subcommand="$(__git_find_on_cmdline "$subcommands")"
+ 
+       if [ -z "$subcommand" ]; then
+               __gitcomp "$subcommands"
+       else
+               __gitcomp "$(__git_refs)"
+       fi
+ }
+ 
  __git_send_email_confirm_options="always never auto cc compose"
  __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
  
@@@ -1864,50 -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
@@@ -1921,29 -1912,21 +1932,29 @@@
                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
@@@ -1953,7 -1936,6 +1964,7 @@@
                core.repositoryFormatVersion
                core.safecrlf
                core.sharedRepository
 +              core.sparseCheckout
                core.symlinks
                core.trustctime
                core.warnAmbiguousRefs
@@@ -1961,17 -1943,15 +1972,17 @@@
                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
@@@ -1983,8 -1963,6 +1994,8 @@@
                format.subjectprefix
                format.suffix
                format.thread
 +              format.to
 +              gc.
                gc.aggressiveWindow
                gc.auto
                gc.autopacklimit
@@@ -2022,20 -2000,15 +2033,20 @@@
                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
@@@ -2044,7 -2017,6 +2055,7 @@@
                imap.sslverify
                imap.tunnel
                imap.user
 +              init.templatedir
                instaweb.browser
                instaweb.httpd
                instaweb.local
@@@ -2052,29 -2024,19 +2063,29 @@@
                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
@@@ -2085,42 -2047,31 +2096,42 @@@
                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
@@@ -2131,8 -2082,6 +2142,8 @@@
                showbranch.default
                status.relativePaths
                status.showUntrackedFiles
 +              status.submodulesummary
 +              submodule.
                tar.umask
                transfer.unpackLimit
                url.