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>
Chris Packham committed
Dec 14, 2016 at 21:37 UTC
c261a87e704679203510d48ff4db7bc7006b8a5a
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1552,7 +1552,7 @@ _git_merge ()
1552
case "$cur" in
1553
--*)
1554
__gitcomp "$__git_merge_options
1555
- --rerere-autoupdate --no-rerere-autoupdate --abort"
1555
+ --rerere-autoupdate --no-rerere-autoupdate --abort --continue"
1556
return
1557
esac
1558
__gitcomp_nl "$(__git_refs)"