Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] completion: git: update list of builtintools
- X-seq: zsh-workers 34748
- From: Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] completion: git: update list of builtintools
- Date: Fri, 20 Mar 2015 02:11:40 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received:received; s=postfix2; t=1426813902; bh=gjNggrtgxj46jSI orhLD3rQg1nLWXqWj5MN/ycmB7TY=; b=Jsi/n7i4OwdH9fZbedj+hiY6pwVZUpE 6b7dPjU7FFPUinyB8LjJFghALAVJxTYwcUJjaF6/keg8WKAwqvGMEGBgxHUalJEl RRJ6U79TVizF3TuAQCXUuVkFBJKt0kD2vZn25kQeANXV6PfpzWz/aH3TvnjkyHyB 1Zsdf7QHA9Hg=
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
From: Daniel Hahler <git@xxxxxxxxxx>
---
Completion/Unix/Command/_git | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5524cb0..8b10fec 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6532,21 +6532,28 @@ __git_diff-or-merge-tools () {
[[ $type == diff ]] && __git_config_get_regexp '^difftool\..+\.cmd$' userdifftools
__git_config_get_regexp '^mergetool\..+\.cmd$' usermergetools
builtintools=(
+ araxis
+ bc
+ bc3
+ codecompare
+ deltawalker
+ diffmerge
+ diffuse
+ ecmerge
+ emerge
+ gvimdiff
+ gvimdiff2
+ gvimdiff3
kdiff3
- tkdiff
- xxdiff
meld
opendiff
+ p4merge
+ tkdiff
+ tortoisemerge
vimdiff
- gvimdiff
vimdiff2
vimdiff3
- gvimdiff2
- emerge
- ecmerge
- diffuse
- araxis
- p4merge)
+ xxdiff)
builtindifftools=($builtintools kompare)
builtinmergetools=($builtintools tortoisemerge)
--
2.3.0.149.gf3f4077.dirty
Messages sorted by:
Reverse Date,
Date,
Thread,
Author