merge-recursive --patience

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d950776426de524546cd792b2390be76df81b718..14874377afca6de0629814240086c64ff19df26d 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -842,7 +842,7 @@ _git_checkout ()
        --*)
                __gitcomp "
                        --quiet --ours --theirs --track --no-track --merge
-                       --conflict= --patch
+                       --conflict= --orphan --patch
                        "
                ;;
        *)