From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jun 2017 20:27:05 +0000 (-0700)
Subject: Merge branch 'rf/completion-config-commit' into maint
X-Git-Tag: v2.13.2~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0538abaf7ad330ab639f418e9de82ef8adbe5bb?ds=inline;hp=-c

Merge branch 'rf/completion-config-commit' into maint

Completion update.

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

e0538abaf7ad330ab639f418e9de82ef8adbe5bb
diff --combined contrib/completion/git-completion.bash
index 3f01249116,535a19a70c..ba7d8dddc9
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -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
@@@ -2825,9 -2828,6 +2828,9 @@@
  		esac
  	else
  		case "$subcommand,$cur" in
 +		push,--*)
 +			__gitcomp "$save_opts --message"
 +			;;
  		save,--*)
  			__gitcomp "$save_opts"
  			;;