Merge branch 'tb/complete-checkout' into maint
Command line completion (in contrib/) update. * tb/complete-checkout: completion: add remaining flags to checkout
This commit is contained in:
commit
ea3321992b
@ -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
|
||||
"
|
||||
;;
|
||||
*)
|
||||
|
@ -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
|
||||
'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user