* Unifying mergetool configuration between git and git-gui
@ 2012-07-22 14:22 Sebastian Schuberth
2012-07-23 2:00 ` David Aguilar
0 siblings, 1 reply; 2+ messages in thread
From: Sebastian Schuberth @ 2012-07-22 14:22 UTC (permalink / raw)
To: git; +Cc: Shawn Pearce
Hi,
I was about to add a configuration for yet another mergetool when I
realized that git gui's mergetool.tcl pretty much duplicates git's
mergetools/* configuration files. Can some one tell me why this is
necessary? I would have expected git gui to simply rely on "git
mergetool" to launch the mergetool. Or, in case that git gui needs to
use a different tool than the one configured as mergetool, that
mergetool.tcl somehow uses the configuration from mergetools/*.
Thanks for any insights.
--
Sebastian Schuberth
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Unifying mergetool configuration between git and git-gui
2012-07-22 14:22 Unifying mergetool configuration between git and git-gui Sebastian Schuberth
@ 2012-07-23 2:00 ` David Aguilar
0 siblings, 0 replies; 2+ messages in thread
From: David Aguilar @ 2012-07-23 2:00 UTC (permalink / raw)
To: Sebastian Schuberth; +Cc: git, Shawn Pearce
On Sun, Jul 22, 2012 at 7:22 AM, Sebastian Schuberth
<sschuberth@gmail.com> wrote:
> Hi,
>
> I was about to add a configuration for yet another mergetool when I realized
> that git gui's mergetool.tcl pretty much duplicates git's mergetools/*
> configuration files. Can some one tell me why this is necessary? I would
> have expected git gui to simply rely on "git mergetool" to launch the
> mergetool. Or, in case that git gui needs to use a different tool than the
> one configured as mergetool, that mergetool.tcl somehow uses the
> configuration from mergetools/*.
>
> Thanks for any insights.
I think the mergetool stuff in git-gui predates git-mergetool.
Ditto the "external diff" stuff in gitk -- it predates git-difftool.
It would be good to unify these so that the difftool/mergetool
experience is consistent.
As for how to have different diff/merge tools in GUI vs non-GUI modes
-- we have 'diff.guitool' to override 'diff.tool' when "git difftool
--gui" is used. We do not have an equivalent 'merge.guitool', but
that would probably be the way to do it.
--
David
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-23 2:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-22 14:22 Unifying mergetool configuration between git and git-gui Sebastian Schuberth
2012-07-23 2:00 ` David Aguilar
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).