about summary refs log tree commit diff
diff options
context:
space:
mode:
authorm0viefreak <m0viefreak.cm@googlemail.com>2013-10-20 19:41:05 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-10-21 17:39:59 +0200
commit7a37568b8c6a142e9ccbae3a96fb6041a46646f5 (patch)
tree6649fada254dcaebb8056295010e048bc9a35605
parent2c1affc6c10fb59ed900d5dc5bf146a0b9851890 (diff)
downloadzsh-7a37568b8c6a142e9ccbae3a96fb6041a46646f5.tar.gz
zsh-7a37568b8c6a142e9ccbae3a96fb6041a46646f5.tar.xz
zsh-7a37568b8c6a142e9ccbae3a96fb6041a46646f5.zip
31855: _git: revert: add '-e,--edit'
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61743a9f1..e98598fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* 31856: Completion/Unix/Command/_git: _git: fix a few
 	"undocumented" options
 
+	* 31855: Completion/Unix/Command/_git: _git: revert: add
+	'-e,--edit'
+
 2013-10-21  Øystein Walle  <oystwa@gmail.com>
 
 	* 31858: Completion/Unix/Command/_git: _git: fix wrong default
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 6f631bced..db1ff2f3f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1320,8 +1320,9 @@ _git-revert () {
     '(- :)--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]' \
+    '(-e --edit --no-edit)--no-edit[do not edit the commit message 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]' \
     '(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \
     '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
     ': :__git_commits'