git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git mergetool, merge.tool, merge.guitool and DISPLAY

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 9, 2022, 18:48 UTC
Message-ID
<xmqqmtb8jsej.fsf@gitster.g>
In-Reply-To
<CAPMMpoj9ww18j4gUKhXsLFUGrYsbuq6Aww4z9VDboA3h78eHsw@mail.gmail.com>
Tao Klerks <tao@klerks.biz> writes:
Show 6 quoted lines
> 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".

Previous: Tao KlerksNext: Tao Klerks
Message 4 of 5 in “git mergetool, merge.tool, merge.guitool and DISPLAY”
  1. Tao KlerksSep 9, 2022
  2. Junio C HamanoSep 9, 2022
  3. Tao KlerksSep 9, 2022
  4. Junio C HamanoSep 9, 2022
  5. Tao KlerksOct 12, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.