From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Feb 2013 00:06:19 +0000 (-0800)
Subject: Merge branch 'mm/config-local-completion'
X-Git-Tag: v1.8.2-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b1bcb973af0c4d9aceffad43104bb2f4d406dd3b?hp=6bdecc8f56a06f085b4444dc29361a5aa80d9eef

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 c8452fb163..059ba9d3e4 100644
--- 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