[PATCHv2 2/2] completion: add --continue option for merge
From: Chris Packham <hidden>
Date: 2016-12-13 08:49:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
Add 'git merge --continue' option when completing.
Signed-off-by: Chris Packham <redacted>
---
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