undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bash: teach 'git checkout' options

Browse Source 
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
SZEDER Gábor 2009-09-24 14:23:15 +02:00 committed by Shawn O. Pearce
parent efe47f8f2c
commit e648f8b6d0
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/completion/git-completion.bash
View File

@ -810,7 +810,21 @@ _git_checkout ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
__gitcomp "$(__git_refs)" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--conflict=*)
__gitcomp "diff3 merge" "" "${cur##--conflict=}"
;;
--*)
__gitcomp "
--quiet --ours --theirs --track --no-track --merge
--conflict= --patch
"
;;
*)
__gitcomp "$(__git_refs)"
;;
esac
} }
_git_cherry () _git_cherry ()