[PATCH] completion: git: provide --amend also with "message" group

[PATCH] completion: git: provide --amend also with "message" group

[Daniel Hahler]

From: Daniel Hahler <git@thequod.de>

Especially during a git rebase, you would use `git commit -m foo
--amend`.
---
 Completion/Unix/Command/_git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c01333b..0510bbc 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] )) ||
-- 
2.4.0.dirty

Re: [PATCH] completion: git: provide --amend also with "message" group

[Daniel Shahaf]

Daniel Hahler wrote on Wed, May 13, 2015 at 14:51:55 +0200:
> +    $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'

I notice you haven't pushed this yet.  Any particular reason not to push it?

Cheers,

Daniel