diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:31 +0900 |
| commit | 30af513004af513206bf52f4a11c40205d868500 (patch) | |
| tree | fcec294e7b186afbd4235fa49a143e9ebc357330 | |
| parent | 9c958d69061b991097827fc53910dcb1b4f80485 (diff) | |
| parent | 6357d9d00405ae16d63610ec2d049e0ca7e391ea (diff) | |
| download | git-30af513004af513206bf52f4a11c40205d868500.tar.gz | |
Merge branch 'tb/complete-checkout'
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 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 " ;; *) 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 ' |