summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git9
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28903e45e..d8955503c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-16  Clint Adams  <clint@zsh.org>
 
+	* 25462: Completion/Unix/Command/_git: patch to add some -s -w
+	to _arguments and new options for revert, from Mikael Magnusson.
+
 	* 25461: Completion/Unix/Command/_git: patch to add HEAD as
 	a completion for heads, from Mikael Magnusson.
 
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
 }