From: Sven Strickroth <sven.strickroth@tu-clausthal•de>
To: git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>,
Sebastian Schuberth <sschuberth@gmail•com>,
davvid@gmail•com, Jeff King <peff@peff•net>
Subject: Re: [PATCH] mergetools: Add tortoisegitmerge helper
Date: Thu, 24 Jan 2013 23:07:33 +0100 [thread overview]
Message-ID: <5101B0A5.1020308@tu-clausthal.de> (raw)
In-Reply-To: <7vfw1qbbr4.fsf@alter.siamese.dyndns.org>
Am 24.01.2013 20:51 schrieb Junio C Hamano:
> Sven Strickroth <sven.strickroth@tu-clausthal•de> writes:
>
>> - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe
>> (starting with 1.8.0) in order to make clear that this one has special
>> support for git and prevent confusion with the TortoiseSVN TortoiseMerge
>> version.
>
> Wouldn't it make more sense in such a situation if your users can
> keep using the old "tortoisemerge" configured in their configuration
> and when the renamed one is found the mergetool automatically used
> it, rather than the way your patch is done?
That was also my first idea, however, TortoiseMerge uses parameters as
follows: '-base:"$BASE"'. TortoiseGitMerge uses values separated by
space from keys: '-base "$BASE"'. So both are incompatible (the first
approach has problems with spaces in filenames, the TortoiseGitMerge
approach fixes this).
>> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
>> index 4314ad0..13cbe5b 100644
>> --- a/Documentation/diff-config.txt
>> +++ b/Documentation/diff-config.txt
>> @@ -151,7 +151,7 @@ diff.<driver>.cachetextconv::
>> diff.tool::
>> The diff tool to be used by linkgit:git-difftool[1]. This
>> option overrides `merge.tool`, and has the same valid built-in
>> - values as `merge.tool` minus "tortoisemerge" and plus
>> - "kompare". Any other value is treated as a custom diff tool,
>> + values as `merge.tool` minus "tortoisemerge"/"tortoisegitmerge" and
>> + plus "kompare". Any other value is treated as a custom diff tool,
>> and there must be a corresponding `difftool.<tool>.cmd`
>> option.
>
> So in short, two tortoises and kompare are only valid as mergetool
> but cannot be used as difftool? No, I am reading it wrong.
> merge.tool can be used for both, kompare can be used as difftool,
> and two tortoises can only be used as mergetool.
>
> This paragraph needs to be rewritten to unconfuse readers. The
> original is barely intelligible, and it becomes unreadable as the
> set of tools subtracted by "minus" and added by "plus" grows.
But I think this should not be part of this patch.
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
next prev parent reply other threads:[~2013-01-24 22:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 11:27 [PATCH] mergetools: Add tortoisegitmerge helper Sven Strickroth
2013-01-21 0:43 ` Junio C Hamano
2013-01-21 8:24 ` Sven Strickroth
2013-01-21 8:26 ` Sven Strickroth
2013-01-24 11:19 ` Sven Strickroth
2013-01-24 19:51 ` Junio C Hamano
2013-01-24 22:07 ` Sven Strickroth [this message]
2013-01-24 22:15 ` Junio C Hamano
2013-01-25 6:11 ` David Aguilar
2013-01-25 7:21 ` Junio C Hamano
2013-01-25 7:54 ` David Aguilar
2013-01-25 9:48 ` John Keeping
2013-01-25 9:06 ` [PATCH] mergetools: Enhance tortoisemerge to work with Sven Strickroth
2013-01-25 10:09 ` David Aguilar
2013-01-25 13:07 ` Sven Strickroth
2013-01-25 18:28 ` Junio C Hamano
2013-01-26 0:58 ` Sven Strickroth
2013-01-26 1:14 ` Sven Strickroth
2013-01-26 1:15 ` [PATCH 1/2] mergetools: Added support for TortoiseGitMerge Sven Strickroth
2013-01-26 1:17 ` [PATCH 2/2] mergetools: Make tortoisemerge work with Sven Strickroth
2013-01-26 7:10 ` David Aguilar
2013-01-27 9:14 ` Sven Strickroth
2013-01-27 17:48 ` Junio C Hamano
2013-02-01 19:33 ` [PATCH] mergetools: Enable tortoisemerge to handle filenames with Sven Strickroth
2013-02-01 20:07 ` Sebastian Schuberth
2013-02-01 20:10 ` Sven Strickroth
2013-02-01 20:15 ` Junio C Hamano
2013-02-01 20:17 ` Sven Strickroth
2013-02-01 20:16 ` [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge Sven Strickroth
2013-02-02 1:59 ` David Aguilar
2013-02-02 2:08 ` Junio C Hamano
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=5101B0A5.1020308@tu-clausthal.de \
--to=sven.strickroth@tu-clausthal$(echo .)de \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sschuberth@gmail$(echo .)com \
/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