Merge branch 'rf/completion-config-commit'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000 (09:55 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:44 +0000 (09:55 +0900)
Completion update.

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

1  2 
contrib/completion/git-completion.bash
index 45a78a09531345f10a26d440bbbf6f381c4033bc,535a19a70c030d984f347673219099fa8ae1089e..15b40f877489ff43714e9cfce87f06543891b8f6
@@@ -1319,7 -1319,6 +1319,7 @@@ _git_clone (
                        --template=
                        --depth
                        --single-branch
 +                      --no-tags
                        --branch
                        --recurse-submodules
                        --no-single-branch
@@@ -2388,15 -2387,16 +2388,18 @@@ _git_config (
                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
                color.ui
+               commit.cleanup
+               commit.gpgSign
                commit.status
                commit.template
+               commit.verbose
                core.abbrev
                core.askpass
                core.attributesfile
@@@ -2813,7 -2813,7 +2816,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"
                        ;;