From: Junio C Hamano <gitster@pobox•com>
To: John Keeping <john@keeping•me.uk>
Cc: git@vger•kernel.org, David Aguilar <davvid@gmail•com>
Subject: Re: mergetool: include custom tools in '--tool-help'
Date: Sun, 27 Jan 2013 12:13:33 -0800 [thread overview]
Message-ID: <7vmwvuv0ya.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130127195618.GS7498@serenity.lan> (John Keeping's message of "Sun, 27 Jan 2013 19:56:18 +0000")
John Keeping <john@keeping•me.uk> writes:
> I think I'd want to do this with a suffix if at all, so the output would
> be like this:
>
> 'git mergetool --tool=<tool>' may be set to one of the following:
>
> araxis
> gvimdiff
> gvimdiff2
> mytool (user-defined)
> vimdiff
> vimdiff2
That is fine by me, but the real users of mergetool please feel free
to raise objections.
next prev parent reply other threads:[~2013-01-27 20:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-27 16:34 mergetool: include custom tools in '--tool-help' John Keeping
2013-01-27 18:03 ` Junio C Hamano
2013-01-27 19:56 ` John Keeping
2013-01-27 20:13 ` Junio C Hamano [this message]
2013-01-27 21:10 ` David Aguilar
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=7vmwvuv0ya.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=john@keeping$(echo .)me.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox