Merge branch 'mm/config-local-completion'

* mm/config-local-completion:
completion: support 'git config --local'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c8452fb163c6bf75f01ba8b06ded2b8d82143e21..059ba9d3e482c08434fb6860667179a6b73808cd 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1779,7 +1779,7 @@ __git_config_get_set_variables ()
        while [ $c -gt 1 ]; do
                word="${words[c]}"
                case "$word" in
-               --global|--system|--file=*)
+               --system|--global|--local|--file=*)
                        config_file="$word"
                        break
                        ;;
@@ -1885,7 +1885,7 @@ _git_config ()
        case "$cur" in
        --*)
                __gitcomp "
-                       --global --system --file=
+                       --system --global --local --file=
                        --list --replace-all
                        --get --get-all --get-regexp
                        --add --unset --unset-all