diff options
| author | Oliver Kiddle <opk@zsh.org> | 2016-07-25 00:06:57 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2016-07-25 00:06:57 +0200 |
| commit | 4f5cc54560dd95c4db6487a26d40c4b133ff1229 (patch) | |
| tree | 5bf61d9307b911b303164e75ac823d15b4ccc859 /Completion/Unix/Command/_git | |
| parent | 38936: fix vi-pipe function for option compatibility (diff) | |
| download | zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar.gz zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar.bz2 zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar.lz zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar.xz zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.tar.zst zsh-4f5cc54560dd95c4db6487a26d40c4b133ff1229.zip | |
38939: add missing git options
In particular those for GPG signing a push
Diffstat (limited to 'Completion/Unix/Command/_git')
| -rw-r--r-- | Completion/Unix/Command/_git | 67 |
1 files changed, 43 insertions, 24 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index b6da32962..b54b208fb 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -510,7 +510,7 @@ _git-cherry-pick () { '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=-}'[GPG-sign the commit]::key id' \ '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \ '*'{-s+,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' \ - '*'{-X+,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]' \ + '*'{-X+,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' \ '(-e --edit -x -n --no-commit -s --signoff)--ff[fast forward, if possible]' \ ': : __git_commit_ranges -O expl:git_commit_opts' } @@ -1149,6 +1149,7 @@ _git-mv () { declare -A opt_args _arguments -w -C -S -s \ + '(-v --verbose)'{-v,--verbose}'[output additional information]' \ '(-f --force)'{-f,--force}'[rename/move even if targets exist]' \ '-k[skip rename/move that would lead to errors]' \ '(-n --dry-run)'{-n,--dry-run}'[only show what would happen]' \ @@ -1278,7 +1279,7 @@ _git-push () { '--mirror[push all refs under refs/heads/ and refs/tags/ and delete non-existing refs]' \ '(-n --dry-run)'{-n,--dry-run}'[do everything except actually send the updates]' \ '--porcelain[produce machine-readable output]' \ - '--delete[delete all listed refs from the remote repository]' \ + '(-d --delete)'{-d,--delete}'[delete all listed refs from the remote repository]' \ '--tags[all tags under refs/tags are pushed]' \ '--follow-tags[also push missing annotated tags reachable from the pushed refs]' \ '(--receive-pack --exec)'{--receive-pack=-,--exec=-}'[path to git-receive-pack on remote]:remote git-receive-pack:_files' \ @@ -1295,6 +1296,12 @@ _git-push () { '(--verify)--no-verify[bybass the pre-push hook]' \ '--recurse-submodules=[submodule handling]:submodule handling:((check\:"refuse pushing of supermodule if submodule commit cannot be found on the remote" on-demand\:"push all changed submodules"))' \ + '(--no-signed --signed)--sign=[GPG sign the push]:signing enabled:(yes no if-asked)' \ + '(--no-signed --sign)--signed[GPG sign the push]' \ + "(--sign --sign)--no-signed[don't GPG sign the push]" \ + '--atomic[request atomic transaction on remote side]' \ |