bash completion: Add completion for 'git mergetool'
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>
Lee Marlow committed
Aug 14, 2008 at 16:41 UTC
b4c72162f6612ce335af79ef19c5ae16f5585e67
1 file changed
+20
contrib/completion/git-completion.bash
+20
@@ -1001,6 +1001,25 @@ _git_merge ()
1001
__gitcomp "$(__git_refs)"
1002
}
1003
1004
+_git_mergetool ()
1005
+{
1006
+ local cur="${COMP_WORDS[COMP_CWORD]}"
1007
+ case "$cur" in
1008
+ --tool=*)
1009
+ __gitcomp "
1010
+ kdiff3 tkdiff meld xxdiff emerge
1011
+ vimdiff gvimdiff ecmerge opendiff
1012
+ " "" "${cur##--tool=}"
1013
+ return
1014
+ ;;
1015
+ --*)
1016
+ __gitcomp "--tool="
1017
+ return
1018
+ ;;
1019
+ esac
1020
+ COMPREPLY=()
1021
+}
1022
+
1023
_git_merge_base ()
1024
{
1025
__gitcomp "$(__git_refs)"
@@ -1650,6 +1669,7 @@ _git ()
1669
ls-remote) _git_ls_remote ;;
1670
ls-tree) _git_ls_tree ;;
1671
merge) _git_merge;;
1672
+ mergetool) _git_mergetool;;
1673
merge-base) _git_merge_base ;;
1674
mv) _git_mv ;;
1675
name-rev) _git_name_rev ;;