diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:58 +0900 |
| commit | ea3321992b280bb0b8ea781a62e9194ba93ebde0 (patch) | |
| tree | 4154425bac21adfcd6e7537661ff65b0c76471a6 | |
| parent | 3be9ac7e56d4bb4ae805543a91de5987e148b661 (diff) | |
| parent | 6357d9d00405ae16d63610ec2d049e0ca7e391ea (diff) | |
| download | git-ea3321992b280bb0b8ea781a62e9194ba93ebde0.tar.gz | |
Merge branch 'tb/complete-checkout' into maint
Command line completion (in contrib/) update.
* tb/complete-checkout:
completion: add remaining flags to checkout
| -rw-r--r-- | contrib/completion/git-completion.bash | 3 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0e16f017a4..539d7f84f3 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 " ;; *) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 2cb999ecfa..fc614dcbfa 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -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 ' |