diff options
| author | Oliver Kiddle <okiddle@yahoo.co.uk> | 2019-09-27 00:16:54 +0200 |
|---|---|---|
| committer | Oliver Kiddle <okiddle@yahoo.co.uk> | 2019-09-27 00:16:54 +0200 |
| commit | 0ff02590c38cfb54c5df9002ceac898225b8fdd1 (patch) | |
| tree | e4975ab977a65f97f072b08fda2ab49759972e07 /Completion/Unix/Command | |
| parent | unposted (see 44772): quote the string argument to zle -U (diff) | |
| download | zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar.gz zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar.bz2 zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar.lz zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar.xz zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.tar.zst zsh-0ff02590c38cfb54c5df9002ceac898225b8fdd1.zip | |
44779: completion for new git switch and git restore commands
Diffstat (limited to 'Completion/Unix/Command')
| -rw-r--r-- | Completion/Unix/Command/_git | 175 |
1 files changed, 154 insertions, 21 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index afe62915d..29fa379a7 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -451,26 +451,27 @@ _git-checkout () { declare -A opt_args _arguments -C -s \ - '(-q --quiet --progress)'{-q,--quiet}'[suppress progress reporting]' \ + '(-q --quiet)'{-q,--quiet}'[suppress progress reporting]' \ '(-f --force -m --merge --conflict --patch)'{-f,--force}'[force branch switch/ignore unmerged entries]' \ '(-q --quiet -2 --ours -3 --theirs --patch)'{-2,--ours}'[check out stage #2 for unmerged paths]' \ '(-q --quiet -2 --ours -3 --theirs --patch)'{-3,--theirs}'[check out stage #3 for unmerged paths]' \ - '( -B --orphan -2 --ours -3 --theirs --conflict --patch --detach)-b+[create a new branch based at given commit]: :__git_branch_names' \ - '(-b --orphan -2 --ours -3 --theirs --conflict --patch --detach)-B+[create or update branch based at given commit]: :__git_branch_names' \ - '(-t --track --orphan --patch --detach)'{-t,--track}'[set up configuration so pull merges from the base commit]' \ + '( -B --orphan -2 --ours -3 --theirs --conflict --patch -d --detach)-b+[create a new branch based at given commit]: :__git_branch_names' \ + '(-b --orphan -2 --ours -3 --theirs --conflict --patch -d --detach)-B+[create or update branch based at given commit]: :__git_branch_names' \ + '(-t --track --orphan --patch -d --detach)'{-t,--track}'[set up configuration so pull merges from the base commit]' \ '(--patch)--no-track[override the branch.autosetupmerge configuration variable]' \ $new_branch_reflog_opt \ - '(-b -B -t --track --patch --orphan)--detach[detach the HEAD at named commit]' \ - '(-b -B -t --track --patch --detach)--orphan=[create a new orphan branch based at given commit]: :__git_branch_names' \ + '(-b -B -t --track --patch --orphan -d --detach)'{-d,--detach}'[detach the HEAD at named commit]' \ + '(-b -B -t --track --patch -d --detach)--orphan=[create a new orphan branch based at given commit]: :__git_branch_names' \ |