summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorLibravatar Teemu Matilainen <teemu.matilainen@iki.fi>2011-10-06 21:40:30 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-06 15:11:50 -0700
commit77653abd988fb333f7b155e23a3bcea6042505bc (patch)
treedda28d2b5027e23d422694ff4dc6814c62fd5743 /contrib/completion
parentcompletion: unite --reuse-message and --reedit-message handling (diff)
downloadtgif-77653abd988fb333f7b155e23a3bcea6042505bc.tar.xz
completion: commit --fixup and --squash
Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 43a7a36f06..e6fd43bb2d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1287,7 +1287,8 @@ _git_commit ()
" "" "${cur##--cleanup=}"
return
;;
- --reuse-message=*|--reedit-message=*)
+ --reuse-message=*|--reedit-message=*|\
+ --fixup=*|--squash=*)
__gitcomp "$(__git_refs)" "" "${cur#*=}"
return
;;
@@ -1302,7 +1303,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