summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 14:24:31 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-06 14:24:31 +0900
commit30af513004af513206bf52f4a11c40205d868500 (patch)
treefcec294e7b186afbd4235fa49a143e9ebc357330 /contrib
parent9c958d69061b991097827fc53910dcb1b4f80485 (diff)
parent6357d9d00405ae16d63610ec2d049e0ca7e391ea (diff)
downloadgit-30af513004af513206bf52f4a11c40205d868500.tar.gz
Merge branch 'tb/complete-checkout'
Command line completion (in contrib/) update. * tb/complete-checkout: completion: add remaining flags to checkout
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fcd83311a3..fdd984d34a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1250,7 +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
"
;;
*)