From: Theodore Tso <tytso@mit•edu>
To: Martin Langhoff <martin.langhoff@gmail•com>
Cc: Junio C Hamano <gitster@pobox•com>,
Brian Gernhardt <benji@silverinsanity•com>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: Please pull mergetool.git
Date: Mon, 11 Jun 2007 09:31:00 -0400 [thread overview]
Message-ID: <20070611133100.GB15117@thunk.org> (raw)
In-Reply-To: <46a038f90706101855g639656f3qe80adeeb3a7d6dc2@mail.gmail.com>
On Mon, Jun 11, 2007 at 01:55:25PM +1200, Martin Langhoff wrote:
> FWIW, it depends on whether you are using xterm (DISPLAY is set) or
> Terminal.app (DISPLAY may not be set). In any case FileMerge.app will
> ignore DISPLAY.
Is there a reliable way on MacOS to determine whether the user is
sitting in front of the terminal, as opposed to logged into the MacOS
box remotely? Ideally we would only try opendiff/FileMerge.app if we
new that the user is indeed sitting in front of the graphical display.
- Ted
next prev parent reply other threads:[~2007-06-11 13:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-10 16:03 Please pull mergetool.git Theodore Ts'o
2007-06-10 19:55 ` Junio C Hamano
2007-06-10 21:31 ` Theodore Tso
2007-06-10 23:29 ` Brian Gernhardt
2007-06-11 1:02 ` Junio C Hamano
2007-06-11 1:55 ` Martin Langhoff
2007-06-11 13:31 ` Theodore Tso [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-09-29 14:47 Theodore Ts'o
2007-09-29 22:43 ` 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=20070611133100.GB15117@thunk.org \
--to=tytso@mit$(echo .)edu \
--cc=benji@silverinsanity$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=martin.langhoff@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