mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-01 18:51:29 +02:00
Code

Merge branch 'tb/complete-checkout' into maint

Browse Source 
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-15 12:04:58 +09:00
commit ea3321992b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/completion/git-completion.bash
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
"
;;
*)

4
t/t9902-completion.sh
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
'