From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 05:24:31 +0000 (+0900)
Subject: Merge branch 'tb/complete-checkout'
X-Git-Tag: v2.16.0-rc0~157
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/30af513004af513206bf52f4a11c40205d868500?ds=inline;hp=-c

Merge branch 'tb/complete-checkout'

Command line completion (in contrib/) update.

* tb/complete-checkout:
completion: add remaining flags to checkout
---

30af513004af513206bf52f4a11c40205d868500
diff --combined contrib/completion/git-completion.bash
index fcd83311a3,539d7f84f3..fdd984d34a
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1250,7 -1250,8 +1250,8 @@@ _git_checkout (
  	--*)
  		__gitcomp "
  			--quiet --ours --theirs --track --no-track --merge
- 			--conflict= --orphan --patch
+ 			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
+ 			--recurse-submodules --no-recurse-submodules
  			"
  		;;
  	*)
@@@ -2350,7 -2351,6 +2351,7 @@@ _git_config (
  		advice.rmHints
  		advice.statusHints
  		advice.statusUoption
 +		advice.ignoredHook
  		alias.
  		am.keepcr
  		am.threeWay