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

bash completion: Add completion for 'git mergetool'

Browse Source 
The --tool= long option to "git mergetool" can be completed with:

	kdiff3 tkdiff meld xxdiff emerge
	vimdiff gvimdiff ecmerge opendiff

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lee Marlow 2008-08-14 16:41:10 -06:00 committed by Junio C Hamano
parent f491239170
commit b4c72162f6
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,6 +1001,25 @@ _git_merge ()
__gitcomp "$(__git_refs)" __gitcomp "$(__git_refs)"
} }
_git_mergetool ()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--tool=*)
__gitcomp "
kdiff3 tkdiff meld xxdiff emerge
vimdiff gvimdiff ecmerge opendiff
" "" "${cur##--tool=}"
return
;;
--*)
__gitcomp "--tool="
return
;;
esac
COMPREPLY=()
}
_git_merge_base () _git_merge_base ()
{ {
__gitcomp "$(__git_refs)" __gitcomp "$(__git_refs)"
@ -1650,6 +1669,7 @@ _git ()
ls-remote) _git_ls_remote ;; ls-remote) _git_ls_remote ;;
ls-tree) _git_ls_tree ;; ls-tree) _git_ls_tree ;;
merge) _git_merge;; merge) _git_merge;;
mergetool) _git_mergetool;;
merge-base) _git_merge_base ;; merge-base) _git_merge_base ;;
mv) _git_mv ;; mv) _git_mv ;;
name-rev) _git_name_rev ;; name-rev) _git_name_rev ;;