From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 21:12:29 +0000 (-0700)
Subject: Merge branch 'rt/completion-help'
X-Git-Tag: v2.9.0-rc0~135
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8b7475aefc0a88da65c6d495fc518b2b8a72ff47?ds=inline;hp=-c

Merge branch 'rt/completion-help'

Shell completion (in contrib/) updates.

* rt/completion-help:
completion: add 'revisions' and 'everyday' to 'git help'
completion: add option '--guides' to 'git help'
---

8b7475aefc0a88da65c6d495fc518b2b8a72ff47
diff --combined contrib/completion/git-completion.bash
index e3918c87e3,71e1fc8b2c..ffe60048c1
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1312,7 -1312,6 +1312,7 @@@ _git_grep (
  			--full-name --line-number
  			--extended-regexp --basic-regexp --fixed-strings
  			--perl-regexp
 +			--threads
  			--files-with-matches --name-only
  			--files-without-match
  			--max-depth
@@@ -1339,15 -1338,15 +1339,15 @@@ _git_help (
  {
  	case "$cur" in
  	--*)
- 		__gitcomp "--all --info --man --web"
+ 		__gitcomp "--all --guides --info --man --web"
  		return
  		;;
  	esac
  	__git_compute_all_commands
  	__gitcomp "$__git_all_commands $(__git_aliases)
  		attributes cli core-tutorial cvs-migration
- 		diffcore gitk glossary hooks ignore modules
- 		namespaces repository-layout tutorial tutorial-2
+ 		diffcore everyday gitk glossary hooks ignore modules
+ 		namespaces repository-layout revisions tutorial tutorial-2
  		workflows
  		"
  }
@@@ -1813,7 -1812,7 +1813,7 @@@ _git_config (
  		return
  		;;
  	branch.*.rebase)
 -		__gitcomp "false true"
 +		__gitcomp "false true preserve interactive"
  		return
  		;;
  	remote.pushdefault)
@@@ -2060,7 -2059,6 +2060,7 @@@
  		core.sparseCheckout
  		core.symlinks
  		core.trustctime
 +		core.untrackedCache
  		core.warnAmbiguousRefs
  		core.whitespace
  		core.worktree