From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 00:55:44 +0000 (+0900)
Subject: Merge branch 'rf/completion-config-commit'
X-Git-Tag: v2.14.0-rc0~116
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12435b377f4f2e49340be3361fcc8ee128337638?ds=inline;hp=-c

Merge branch 'rf/completion-config-commit'

Completion update.

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

12435b377f4f2e49340be3361fcc8ee128337638
diff --combined contrib/completion/git-completion.bash
index 45a78a0953,535a19a70c..15b40f8774
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -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
@@@ -2828,9 -2828,6 +2831,9 @@@
  		esac
  	else
  		case "$subcommand,$cur" in
 +		push,--*)
 +			__gitcomp "$save_opts --message"
 +			;;
  		save,--*)
  			__gitcomp "$save_opts"
  			;;