Merge branch 'rf/completion-config-commit' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:27:05 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:27:05 +0000 (13:27 -0700)
Completion update.

* rf/completion-config-commit:
completion: add completions for git config commit

1  2 
contrib/completion/git-completion.bash
index 3f012491165ea2814fa2927d6b7942aeae9c8509,535a19a70c030d984f347673219099fa8ae1089e..ba7d8dddc975a6fe2adec333fb63c954ebddd97e
@@@ -2392,8 -2392,11 +2392,11 @@@ _git_config (
                color.status.untracked
                color.status.updated
                color.ui
+               commit.cleanup
+               commit.gpgSign
                commit.status
                commit.template
+               commit.verbose
                core.abbrev
                core.askpass
                core.attributesfile
@@@ -2810,7 -2813,7 +2813,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
                esac
        else
                case "$subcommand,$cur" in
 +              push,--*)
 +                      __gitcomp "$save_opts --message"
 +                      ;;
                save,--*)
                        __gitcomp "$save_opts"
                        ;;