| commit | b4c72162f6612ce335af79ef19c5ae16f5585e67 | |
| author | Lee Marlow <lee.marlow@gmail.com> | |
| Thu, 14 Aug 2008 22:41:10 +0000 (14 16:41 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Aug 2008 00:49:12 +0000 (14 17:49 -0700) | ||
| tree | d8660698a786590a1dfc76cf4af8548695b33c34 | treesnapshot (tar.gz zip) |
| parent | f491239170cb1463c7c3cd970862d6de636ba787 | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory |