X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=aebb0b689040c3f1c1023e3ddf07779178a6bdfb;hb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;hp=57245a8c01fa3aba4f9e3f2bc258b40f38f446c0;hpb=2621ac50cc2c7bb236f7f4abf8bbbb7f30168ff6;p=git.git diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 57245a8c0..aebb0b689 100755 --- 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 " ;; *)