Merge branch 'sm/branch-broken-ref'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 57245a8c01fa3aba4f9e3f2bc258b40f38f446c0..aebb0b689040c3f1c1023e3ddf07779178a6bdfb 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
                        "
                ;;
        *)