about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2015-05-28 20:23:37 +0200
committerDaniel Hahler <git@thequod.de>2015-05-29 01:56:18 +0200
commitda603d0a002128661fa4497043f0efed1072f9ef (patch)
tree2f4cd0f0940e83d7a743a6c29d498ca07d706054
parenta711b2abef9334116b84b6ddaa4707af31c99720 (diff)
downloadzsh-da603d0a002128661fa4497043f0efed1072f9ef.tar.gz
zsh-da603d0a002128661fa4497043f0efed1072f9ef.tar.xz
zsh-da603d0a002128661fa4497043f0efed1072f9ef.zip
35098: completion: git: provide --amend also with "message" group
Especially during a git rebase, you would use `git commit -m foo
--amend`.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fdee045c0..75d21bc11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-28  Daniel Hahler  <zsh@thequod.de>
+
+	* 35098: Completion/Unix/Command/_git: provide --amend also with
+	"message" group.
+
 2015-05-28  Oliver Kiddle  <opk@zsh.org>
 
 	* 35315: Completion/Unix/Command/_git, Completion/X/Command/_matlab;
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index cdfab7d12..b8edc109e 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -681,14 +681,14 @@ _git-commit () {
     '(-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]' \
     '(-a --all --interactive -o --only -i --include *)--interactive[interactively update paths in the index file]' \
+    $amend_opt \
     '*: :__git_ignore_line_inside_arguments __git_changed_files' \
     - '(message)' \
       {-C,--reuse-message=}'[use existing commit object with same log message]: :__git_commits' \
       {-c,--reedit-message=}'[use existing commit object and edit log message]: :__git_commits' \
       {-F,--file=}'[read commit message from given file]: :_files' \
       {-m,--message=}'[use the given message as the commit message]:message' \
-      {-t,--template=}'[use file as a template commit message]:template:_files' \
-      $amend_opt
+      {-t,--template=}'[use file as a template commit message]:template:_files'
 }
 
 (( $+functions[_git-describe] )) ||