git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Tao Klerks <tao@klerks.biz>
Cc: git <git@vger.kernel.org>, Denton Liu <liu.denton@gmail.com>
Subject: Re: git mergetool, merge.tool, merge.guitool and DISPLAY
Date: Fri, 09 Sep 2022 11:48:20 -0700	[thread overview]
Message-ID: <xmqqmtb8jsej.fsf@gitster.g> (raw)
In-Reply-To: <CAPMMpoj9ww18j4gUKhXsLFUGrYsbuq6Aww4z9VDboA3h78eHsw@mail.gmail.com> (Tao Klerks's message of "Fri, 9 Sep 2022 20:09:03 +0200")

Tao Klerks <tao@klerks.biz> writes:

> Excellent, I agree. My concern then is whether this behavior should be
> placed behind a new config switch, to avoid surprising users who might
> have come to expect the current (in my opinion suboptimal) behavior,
> or whether invoking the merge.guitool instead of the merge.tool, when
> there is a merge.guitool of course and the DISPLAY is set, would be a
> net improvement even for those users and should just be implemented.

I wonder if we can think of a new config knob as giving the default
value for the --gui option that is a tristate <false, auto, true>.
When the knob is not set, it default to 'false', which is the
current behaviour.  The default most likely to be the most sensible
would be 'auto' which is "see the environment to guess if use of GUI
is appropriate".


  reply	other threads:[~2022-09-09 18:48 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-09 11:56 git mergetool, merge.tool, merge.guitool and DISPLAY Tao Klerks
2022-09-09 17:07 ` Junio C Hamano
2022-09-09 18:09   ` Tao Klerks
2022-09-09 18:48     ` Junio C Hamano [this message]
2022-10-12 16:03       ` Tao Klerks

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=xmqqmtb8jsej.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=liu.denton@gmail.com \
    --cc=tao@klerks.biz \
    /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).