From: Theodore Tso <tytso@mit.edu>
To: Scott Lamb <slamb@slamb.org>
Cc: Steffen Prohaska <prohaska@zib.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] mergetool: make Apple's FileMerge available as a merge_tool
Date: Mon, 18 Jun 2007 09:18:00 -0400 [thread overview]
Message-ID: <20070618131800.GA30244@thunk.org> (raw)
In-Reply-To: <467652BC.4050900@slamb.org>
On Mon, Jun 18, 2007 at 02:39:08AM -0700, Scott Lamb wrote:
> I propose a simpler test:
>
> if [ -n "$TERM_PROGRAM" ]; then
> echo local
> else
> echo remote
> fi
>
> This environment variable seems to be set by Terminal.app and even two
> alternatives I just tried (iTerm.app and GLterm.app). It's not
> transmitted across ssh unless you stick an AcceptEnv in sshd_config.
Thanks, that's just what I was looking for!
- Ted
prev parent reply other threads:[~2007-06-18 13:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-17 15:59 [PATCH] mergetool: make Apple's FileMerge available as a merge_tool Steffen Prohaska
2007-06-17 16:13 ` Steffen Prohaska
2007-06-17 18:12 ` Theodore Tso
2007-06-17 19:20 ` Steffen Prohaska
2007-06-18 9:39 ` Scott Lamb
2007-06-18 13:18 ` Theodore Tso [this message]
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=20070618131800.GA30244@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
--cc=slamb@slamb.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 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).