summary refs log tree commit diff
path: root/Completion
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-16 13:58:57 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-16 13:58:57 +0000
commit9a9759e3407e89a1abe690f66bef90788b934628 (patch)
treef9b26f719e9f8fa7b7bc843f2bae7735f3dbb56c /Completion
parentf413d1f4d93808813bb228f82b643bf761a7ec43 (diff)
downloadzsh-9a9759e3407e89a1abe690f66bef90788b934628.tar.gz
zsh-9a9759e3407e89a1abe690f66bef90788b934628.tar.xz
zsh-9a9759e3407e89a1abe690f66bef90788b934628.zip
25462: patch to add some -s -w to _arguments and new options for revert, from Mikael Magnusson.
Diffstat (limited to 'Completion')
-rw-r--r--Completion/Unix/Command/_git9
1 files changed, 5 insertions, 4 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c5290d365..cb04d62ce 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1818,7 +1818,7 @@ _git-rebase () {
 
 (( $+functions[_git-repack] )) ||
 _git-repack () {
-  _arguments \
+  _arguments -s -w \
     '-a[pack all objects into a single pack]' \
     '-d[remove redundant packs after packing]' \
     '-f[pass "--no-reuse-delta" option to "git pack-objects"]' \
@@ -1863,9 +1863,10 @@ _git-reset () {
 
 (( $+functions[_git-revert] )) ||
 _git-revert () {
-  _arguments \
-    '(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \
-    '(-e --edit --no-edit)--no-edit[do not start the commit message editor]' \
+  _arguments -s -w \
+    '(-e --edit)'{-e,--edit}'[edit the commit before committing the revert]' \
+    '-x[append commit name when cherry-picking]' \
+    '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
     '(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \
     ':commit:__git_commits' && ret=0
 }