summary refs log tree commit diff
path: root/Completion/Unix
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-09-14 01:34:13 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-09-14 11:21:34 +0200
commit075ad840d60de2d794aea81f2ba2eb2a5473bca4 (patch)
tree8ada66d4d7d956965a0257f2e6be0d5b73e45dfd /Completion/Unix
parent99e3aa58daf5892dbe08f4ad6b547e3894c8b6ad (diff)
downloadzsh-075ad840d60de2d794aea81f2ba2eb2a5473bca4.tar.gz
zsh-075ad840d60de2d794aea81f2ba2eb2a5473bca4.tar.xz
zsh-075ad840d60de2d794aea81f2ba2eb2a5473bca4.zip
31726: _git: add few more arguments for cherry-pick and revert
Signed-off-by: Luka Perkov <luka@openwrt.org>
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_git6
1 files changed, 6 insertions, 0 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a24069a0e..98080403a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -464,6 +464,9 @@ _git-checkout () {
 (( $+functions[_git-cherry-pick] )) ||
 _git-cherry-pick () {
   _arguments \
+    '(- :)--quit[end revert or cherry-pick sequence]' \
+    '(- :)--continue[resume revert or cherry-pick sequence]' \
+    '(- :)--abort[cancel revert or cherry-pick sequence]' \
     '(-e --edit --ff)'{-e,--edit}'[edit commit before committing the revert]' \
     '(--ff)-x[append information about what commit was cherry-picked]' \
     '(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \
@@ -1248,6 +1251,9 @@ _git-reset () {
 (( $+functions[_git-revert] )) ||
 _git-revert () {
   _arguments -w -S -s \
+    '(- :)--quit[end revert or cherry-pick sequence]' \
+    '(- :)--continue[resume revert or cherry-pick sequence]' \
+    '(- :)--abort[cancel revert or cherry-pick sequence]' \
     '(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \
     '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
     '(-e --edit)--no-edit[do not edit the commit message]' \