From: Daniel Hahler <genml+zsh-workers@thequod.de>
To: zsh-workers@zsh.org
Subject: Re: [PATCH] completion: git: update list of builtintools
Date: Thu, 09 Apr 2015 23:57:53 +0200 [thread overview]
Message-ID: <5526F5E1.6020104@thequod.de> (raw)
In-Reply-To: <20150329054904.GB2766@tarsus.local2>
-----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-----
next prev parent reply other threads:[~2015-04-09 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 1:11 Daniel Hahler
2015-03-29 5:49 ` Daniel Shahaf
2015-04-09 21:57 ` Daniel Hahler [this message]
2015-04-10 16:27 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5526F5E1.6020104@thequod.de \
--to=genml+zsh-workers@thequod.de \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).