diff options
| author | Lee Marlow <lee.marlow@gmail.com> | 2008-08-14 16:41:10 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-14 17:49:12 -0700 |
| commit | b4c72162f6612ce335af79ef19c5ae16f5585e67 (patch) | |
| tree | d8660698a786590a1dfc76cf4af8548695b33c34 /contrib | |
| parent | f491239170cb1463c7c3cd970862d6de636ba787 (diff) | |
| download | git-b4c72162f6612ce335af79ef19c5ae16f5585e67.tar.gz git-b4c72162f6612ce335af79ef19c5ae16f5585e67.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d1afe96e1..2f8036d1d 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 ;; |