From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 14 Dec 2016 08:37:56 +0000 (+1300)
Subject: completion: add --continue option for merge
X-Git-Tag: v2.12.0-rc0~105^2~2
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=c261a87e704679203510d48ff4db7bc7006b8a5a;p=git.git

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>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 21016bf8df..1f97ffae19 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)"