Merge branch 'tb/complete-checkout'

Command line completion (in contrib/) update.

* tb/complete-checkout:
  completion: add remaining flags to checkout
This commit is contained in:
Junio C Hamano 2017-11-06 14:24:31 +09:00
commit 30af513004
2 changed files with 6 additions and 1 deletions

View File

@ -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
"
;;
*)

View File

@ -1245,6 +1245,10 @@ test_expect_success 'double dash "git checkout"' '
--conflict=
--orphan Z
--patch Z
--detach Z
--ignore-skip-worktree-bits Z
--recurse-submodules Z
--no-recurse-submodules Z
EOF
'