From: Chris Packham Date: Tue, 13 Dec 2016 08:48:59 GMT Subject: [PATCHv2 2/2] completion: add --continue option for merge Message-ID: <20161213084859.13426-2-judge.packham@gmail.com> In-Reply-To: <20161213084859.13426-1-judge.packham@gmail.com> Add 'git merge --continue' option when completing. Signed-off-by: Chris Packham --- Notes: Changes in v2: - new. contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 21016bf8d..1f97ffae1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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)" -- 2.11.0.24.ge6920cf