* [PATCH] completion: git: update list of builtintools
@ 2015-03-20 1:11 Daniel Hahler
2015-03-29 5:49 ` Daniel Shahaf
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Hahler @ 2015-03-20 1:11 UTC (permalink / raw)
To: zsh-workers
From: Daniel Hahler <git@thequod.de>
---
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] completion: git: update list of builtintools
2015-03-20 1:11 [PATCH] completion: git: update list of builtintools Daniel Hahler
@ 2015-03-29 5:49 ` Daniel Shahaf
2015-04-09 21:57 ` Daniel Hahler
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Shahaf @ 2015-03-29 5:49 UTC (permalink / raw)
To: Daniel Hahler; +Cc: zsh-workers
On Fri, Mar 20, 2015 at 02:11:40AM +0100, Daniel Hahler wrote:
> builtintools=(
> + bc
I don't see bc in <https://github.com/git/git/tree/master/mergetools>,
is it a valid value?
> + bc3
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] completion: git: update list of builtintools
2015-03-29 5:49 ` Daniel Shahaf
@ 2015-04-09 21:57 ` Daniel Hahler
2015-04-10 16:27 ` Daniel Shahaf
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Hahler @ 2015-04-09 21:57 UTC (permalink / raw)
To: zsh-workers
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 29.03.2015 07:49, Daniel Shahaf wrote:
> On Fri, Mar 20, 2015 at 02:11:40AM +0100, Daniel Hahler wrote:
>> builtintools=(
>> + bc
>
> I don't see bc in <https://github.com/git/git/tree/master/mergetools>,
> is it a valid value?
>
>> + bc3
>
Yes, it is:
* commit f13f9b0
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Oct 20 15:49:36 2014 -0700
mergetool: rename bc3 to bc
Beyond Compare version 4 works the same way as version 3, so rename
the existing "bc3" adaptor to just "bc", while keeping "bc3" as a
backward compatible wrapper.
Regards,
Daniel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iD8DBQFVJvXhfAK/hT/mPgARAmCnAJ0ZCnD035MJb6z8iVVP89ol4IA2aACfVwwO
AUprKDB6AgLR4xTPEXNBYWs=
=HZsC
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] completion: git: update list of builtintools
2015-04-09 21:57 ` Daniel Hahler
@ 2015-04-10 16:27 ` Daniel Shahaf
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Shahaf @ 2015-04-10 16:27 UTC (permalink / raw)
To: Daniel Hahler; +Cc: zsh-workers
Daniel Hahler wrote on Thu, Apr 09, 2015 at 23:57:53 +0200:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 29.03.2015 07:49, Daniel Shahaf wrote:
> > On Fri, Mar 20, 2015 at 02:11:40AM +0100, Daniel Hahler wrote:
> >> builtintools=(
> >> + bc
> >
> > I don't see bc in <https://github.com/git/git/tree/master/mergetools>,
> > is it a valid value?
> >
> >> + bc3
> >
>
> Yes, it is:
>
> * commit f13f9b0
> Author: Junio C Hamano <gitster@pobox.com>
> Date: Mon Oct 20 15:49:36 2014 -0700
>
> mergetool: rename bc3 to bc
>
> Beyond Compare version 4 works the same way as version 3, so rename
> the existing "bc3" adaptor to just "bc", while keeping "bc3" as a
> backward compatible wrapper.
Thanks; pushed.
Daniel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-10 16:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-20 1:11 [PATCH] completion: git: update list of builtintools Daniel Hahler
2015-03-29 5:49 ` Daniel Shahaf
2015-04-09 21:57 ` Daniel Hahler
2015-04-10 16:27 ` Daniel Shahaf
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).