* [PATCH 1/9] add long options completion for 'git checkout'
@ 2009-08-08 8:55 Emmanuel Trillaud
0 siblings, 0 replies; only message in thread
From: Emmanuel Trillaud @ 2009-08-08 8:55 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
add long options completion to git checkout
Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-08 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-08 8:55 [PATCH 1/9] add long options completion for 'git checkout' Emmanuel Trillaud
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).