Merge branch 'cb/merge-recursive-fix'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e00454983ee16624910e40fec9ddb12849110b1b..3b25d48098b99646819999bd29e64ade517419d6 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1403,7 +1403,7 @@ _git_reset ()
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --*)
-               __gitcomp "--mixed --hard --soft"
+               __gitcomp "--merge --mixed --hard --soft"
                return
                ;;
        esac