diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:10 -0700 |
| commit | c795df7c0a324319dc453e2c9eaabd1475d75ea4 (patch) | |
| tree | cd5482cddac56fdb8195b8df49456efabcc0b4d5 | |
| parent | Merge branch 'ph/push-to-delete-nothing' (diff) | |
| parent | completion: commit --fixup and --squash (diff) | |
| download | tgif-c795df7c0a324319dc453e2c9eaabd1475d75ea4.tar.xz | |
Merge branch 'tm/completion-commit-fixup-squash'
* tm/completion-commit-fixup-squash:
completion: commit --fixup and --squash
completion: unite --reuse-message and --reedit-message handling
| -rwxr-xr-x | contrib/completion/git-completion.bash | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8648a36e7b..847e6e9aa4 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1259,12 +1259,9 @@ _git_commit () " "" "${cur##--cleanup=}" return ;; - --reuse-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}" - return - ;; - --reedit-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}" + --reuse-message=*|--reedit-message=*|\ + --fixup=*|--squash=*) + __gitcomp "$(__git_refs)" "" "${cur#*=}" return ;; --untracked-files=*) @@ -1278,7 +1275,7 @@ _git_commit () --dry-run --reuse-message= --reedit-message= --reset-author --file= --message= --template= --cleanup= --untracked-files --untracked-files= - --verbose --quiet + --verbose --quiet --fixup= --squash= " return esac |