1
0
mirror of https://github.com/git/git.git synced 2024-10-22 15:58:13 +02:00

completion: add --continue option for merge

Add 'git merge --continue' option when completing.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Chris Packham 2016-12-14 21:37:56 +13:00 committed by Junio C Hamano
parent 367ff69428
commit c261a87e70

@ -1552,7 +1552,7 @@ _git_merge ()
case "$cur" in
--*)
__gitcomp "$__git_merge_options
--rerere-autoupdate --no-rerere-autoupdate --abort"
--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
return
esac
__gitcomp_nl "$(__git_refs)"