diff options
| author | Chris Packham <judge.packham@gmail.com> | 2016-12-14 21:37:56 +1300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-14 10:02:04 -0800 |
| commit | c261a87e704679203510d48ff4db7bc7006b8a5a (patch) | |
| tree | 4ca1d22b971a101e31cdd94bdcb9e9cbd3bfe75f /contrib | |
| parent | 367ff694281ce569edd8f6e444fc770f92f5d215 (diff) | |
| download | git-c261a87e704679203510d48ff4db7bc7006b8a5a.tar.gz git-c261a87e704679203510d48ff4db7bc7006b8a5a.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
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)" |