Lee Marlow <lee.marlow@xxxxxxxxx> wrote:
> The --tool= long option can be completed with
> kdiff3 tkdiff meld xxdiff emerge
> vimdiff gvimdiff ecmerge opendiff
>
> Signed-off-by: Lee Marlow <lee.marlow@xxxxxxxxx>
Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
... for both patches in this series. But this is new functionality
so it probably won't be in 1.6.0; its too late in that release cycle.
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 78189c1..4089670 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1001,6 +1001,25 @@ _git_merge ()
> __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 ()
> {
> __gitcomp "$(__git_refs)"
> @@ -1650,6 +1669,7 @@ _git ()
> ls-remote) _git_ls_remote ;;
> ls-tree) _git_ls_tree ;;
> merge) _git_merge;;
> + mergetool) _git_mergetool;;
> merge-base) _git_merge_base ;;
> mv) _git_mv ;;
> name-rev) _git_name_rev ;;
--
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
