From: John Keeping <john@keeping.me.uk>
To: David Aguilar <davvid@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 0/4] Auto-generate mergetool lists
Date: Mon, 28 Jan 2013 21:01:36 +0000 [thread overview]
Message-ID: <20130128210136.GC7498@serenity.lan> (raw)
In-Reply-To: <CAJDDKr75K3RGgU79nrznbpjQMLQGkDs=W8XEofURNsS1X1bvjg@mail.gmail.com>
On Sun, Jan 27, 2013 at 06:41:04PM -0800, David Aguilar wrote:
> John, I didn't completely address your question about keeping
> the sort and prefix in show_tool_help() but I can stop poking at
> it now in case you want to start looking at what it would take
> to get custom tools listed in the --tool-help output.
I've had a quick look and it's quite straightforward to build on top of
this to get an output format like this:
'git mergetool --tool-<tool>' may be set to one of the following:
araxis
gvimdiff
gvimdiff2
vimdiff
vimdiff2
user-defined:
mytool
The following tools are valid, but not currently available:
bc3
codecompare
deltawalker
diffuse
ecmerge
emerge
kdiff3
meld
opendiff
p4merge
tkdiff
tortoisemerge
xxdiff
user-defined:
mybrokentool
Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.
I don't think the suffix form would be too hard either - it just
requires moving an explicit sort into the top-level shot_tool_help
function.
I'm going to hold off doing any more on this until da/mergetool-docs has
graduated to next since I think it will be easier to just build on that
rather than trying to put all the necessary pieces into place now.
John
next prev parent reply other threads:[~2013-01-28 21:02 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 0:52 [PATCH v2 0/4] Auto-generate mergetool lists David Aguilar
2013-01-28 0:52 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions David Aguilar
2013-01-28 0:52 ` [PATCH v2 2/4] mergetool--lib: Improve the help text in guess_merge_tool() David Aguilar
2013-01-28 0:52 ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools David Aguilar
2013-01-28 0:52 ` [PATCH v2 4/4] doc: Generate a list of valid merge tools David Aguilar
2013-01-28 2:14 ` Junio C Hamano
2013-01-28 19:37 ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools John Keeping
2013-01-28 20:36 ` Junio C Hamano
2013-01-29 19:48 ` John Keeping
2013-01-29 20:22 ` Junio C Hamano
2013-01-29 22:27 ` David Aguilar
2013-01-29 22:55 ` Junio C Hamano
2013-01-29 23:06 ` John Keeping
2013-01-30 3:08 ` Junio C Hamano
2013-01-30 3:34 ` Junio C Hamano
2013-01-29 23:02 ` John Keeping
2013-01-29 19:22 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions John Keeping
2013-01-29 22:09 ` David Aguilar
2013-01-29 22:27 ` Junio C Hamano
2013-01-30 6:20 ` [PATCH v3 1/4] mergetool--lib: simplify " David Aguilar
2013-01-30 7:04 ` Junio C Hamano
2013-01-28 2:08 ` [PATCH v2 0/4] Auto-generate mergetool lists Junio C Hamano
2013-01-28 2:21 ` David Aguilar
2013-01-28 2:27 ` Junio C Hamano
2013-01-28 2:41 ` David Aguilar
2013-01-28 2:53 ` Junio C Hamano
2013-01-28 21:01 ` John Keeping [this message]
2013-01-28 21:50 ` Junio C Hamano
2013-01-28 22:21 ` John Keeping
2013-01-29 11:56 ` Joachim Schmitz
2013-01-29 12:09 ` John Keeping
2013-01-29 16:15 ` Junio C Hamano
2013-01-29 16:46 ` John Keeping
2013-01-28 8:20 ` Philip Oakley
2013-01-28 9:16 ` David Aguilar
2013-01-28 21:19 ` Philip Oakley
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=20130128210136.GC7498@serenity.lan \
--to=john@keeping.me.uk \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.