From: Emmanuel Trillaud Date: Sat, 08 Aug 2009 08:55:21 GMT Subject: [PATCH 1/9] add long options completion for 'git checkout' Message-ID: <9f50533b0908080155o45163caby4f91b05ac1152a81@mail.gmail.com> add long options completion to git checkout Signed-off-by: Emmanuel Trillaud --- contrib/completion/git-completion.bash | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 745b5fb..bc5427f 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -815,8 +815,18 @@ _git_bundle () _git_checkout () { __git_has_doubledash && return - - __gitcomp "$(__git_refs)" + case "${COMP_WORDS[COMP_CWORD]}" in + --*) + __gitcomp " + --ours --theirs --track --no-track --merge + --conflict= + " + ;; + *) + __gitcomp "$(__git_refs)" + ;; + esac + } _git_cherry () -- 1.6.4