diff options
| author | Øystein Walle <oystwa@gmail.com> | 2014-09-16 10:28:07 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2014-09-23 22:26:20 +0200 |
| commit | 8560d4ff316cdf75dcd16cd8f4a30f77f9779681 (patch) | |
| tree | 73bd2a9cfa1436c108e2c9a56f0c5d20a8685f0f /Completion/Unix/Command/_git | |
| parent | unposted: more NEWS tweaks while I'm there. (diff) | |
| download | zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar.gz zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar.bz2 zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar.lz zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar.xz zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.tar.zst zsh-8560d4ff316cdf75dcd16cd8f4a30f77f9779681.zip | |
33179: _git: updates for Git 2.0.0
This incorporates changes mentioned in the release notes since 1.9.0.
Diffstat (limited to 'Completion/Unix/Command/_git')
| -rw-r--r-- | Completion/Unix/Command/_git | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 34a4e4f36..f3d4f6a34 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -104,6 +104,8 @@ _git-am () { # undocumented (and not implemented here). _arguments -S \ '(-s --signoff)'{-s,--signoff}'[add Signed-off-by: line to the commit message]' \ + '(-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]' \ '(-k --keep)'{-k,--keep}'[pass -k to git mailinfo]' \ '--keep-non-patch[pass -b to git mailinfo]' \ '( --no-keep-cr)--keep-cr[pass --keep-cr to git mailsplit]' \ @@ -508,6 +510,8 @@ _git-cherry-pick () { '(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \ |