From: Sebastian Schuberth <sschuberth@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH v2 2/5] Use variables for the lists of tools that support merging / diffing
Date: Mon, 23 Jul 2012 20:30:37 +0200 [thread overview]
Message-ID: <500D984D.4070909@gmail.com> (raw)
In-Reply-To: <7vvchemnmn.fsf@alter.siamese.dyndns.org>
On 23.07.2012 18:46, Junio C Hamano wrote:
>> +# Tools that support both merging and diffing.
>> __git_mergetools_common="araxis bc3 diffuse ecmerge emerge gvimdiff
>> kdiff3 meld opendiff p4merge tkdiff vimdiff xxdiff
>> "
>
> As the set of merge capable tools is not a superset of diff capable
> tools (tortoise can only merge but not diff), perhaps rename this to
> __git_diffmerge_tools or something?
Makes perfect sense.
> This patch makes sense to me, but at the same time makes [PATCH 1/5]
> a "Meh", methinks.
Yeah, I can see why. So I've renamed __git_mergetools_common to __git_diffmerge_tools and squashed with [PATCH 1/5] to make it less "Meh" as it does not stand on its own.
--
Sebastian
next prev parent reply other threads:[~2012-07-23 18:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-23 7:10 [PATCH 0/4] Various merge / diff tool related minor clean-ups and improvements Sebastian Schuberth
2012-07-23 7:14 ` [PATCH v2 0/5] " Sebastian Schuberth
2012-07-23 7:17 ` [PATCH v2 1/5] Sort the list of tools that support both merging and diffing alphabetically Sebastian Schuberth
2012-07-23 7:18 ` [PATCH v2 2/5] Use variables for the lists of tools that support merging / diffing Sebastian Schuberth
2012-07-23 16:46 ` Junio C Hamano
2012-07-23 18:30 ` Sebastian Schuberth [this message]
2012-07-23 18:32 ` [PATCH 1/4] " Sebastian Schuberth
2012-07-23 18:37 ` [PATCH v2 2/5] " Junio C Hamano
2012-07-23 19:03 ` Sebastian Schuberth
2012-07-23 7:18 ` [PATCH 3/5] Explicitly list all valid diff tools and document --tool-help as an option Sebastian Schuberth
2012-07-23 16:48 ` Junio C Hamano
2012-07-23 17:21 ` mergetool: support --tool-help option like difftool does Junio C Hamano
2012-07-23 18:56 ` Sebastian Schuberth
2012-07-23 18:58 ` [PATCH] " Sebastian Schuberth
2012-07-23 19:52 ` Junio C Hamano
2012-07-23 20:14 ` Sebastian Schuberth
2012-07-23 20:44 ` David Aguilar
2012-07-23 21:16 ` Junio C Hamano
2012-07-23 21:27 ` Sebastian Schuberth
2012-07-23 22:31 ` Junio C Hamano
2012-08-23 5:33 ` Re*: " Junio C Hamano
2012-08-23 7:39 ` David Aguilar
2012-08-23 17:39 ` Junio C Hamano
2012-08-24 8:31 ` David Aguilar
2012-08-26 18:38 ` Jens Lehmann
2012-07-23 7:19 ` [PATCH v2 4/5] Make sure to use Araxis' "compare" and not e.g. ImageMagick's Sebastian Schuberth
2012-07-23 16:50 ` Junio C Hamano
2012-07-23 19:37 ` [PATCH] " Sebastian Schuberth
2012-07-23 20:47 ` Junio C Hamano
2012-07-23 21:09 ` Sebastian Schuberth
2012-07-23 21:24 ` Junio C Hamano
2012-07-23 21:31 ` Sebastian Schuberth
2012-07-23 21:34 ` David Aguilar
2012-07-23 21:44 ` Sebastian Schuberth
2012-07-23 21:26 ` Andreas Schwab
2012-07-23 22:22 ` Junio C Hamano
2012-07-23 22:39 ` Sebastian Schuberth
2012-07-23 22:41 ` Junio C Hamano
2012-07-23 23:09 ` Sebastian Schuberth
2012-07-23 7:20 ` [PATCH v2 5/5] Add a few more code comments and blank lines in guess_merge_tool Sebastian Schuberth
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=500D984D.4070909@gmail.com \
--to=sschuberth@gmail.com \
--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.