SZEDER G??bor <szeder@xxxxxxxxxx> wrote: > @@ -809,7 +809,18 @@ _git_checkout () > { > __git_has_doubledash && return > > - __gitcomp "$(__git_refs)" > + local cur="${COMP_WORDS[COMP_CWORD]}" > + case "$cur" in > + --*) > + __gitcomp " > + --quiet --ours --theirs --track --no-track --merge > + --conflict= --patch If we are completing long options, shouldn't we also complete the supported values for --conflict? According to the docs, this is 'merge' and 'diff3'. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html