All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Cc: Shawn Pearce <spearce@spearce.org>
Subject: Unifying mergetool configuration between git and git-gui
Date: Sun, 22 Jul 2012 16:22:23 +0200	[thread overview]
Message-ID: <500C0C9F.1000709@gmail.com> (raw)

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

             reply	other threads:[~2012-07-22 14:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-22 14:22 Sebastian Schuberth [this message]
2012-07-23  2:00 ` Unifying mergetool configuration between git and git-gui 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=500C0C9F.1000709@gmail.com \
    --to=sschuberth@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    /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.