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

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

From
Tao Klerks <tao@klerks.biz>
Date
Oct 12, 2022, 16:03 UTC
Message-ID
<CAPMMpojtZDiJcTgQDrnXuOvDrR2RB30BdyhNZB4MmryO0RxJ=g@mail.gmail.com>
In-Reply-To
<xmqqmtb8jsej.fsf@gitster.g>
On Fri, Sep 9, 2022 at 8:48 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
>
> 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".
>

I just submitted an RFC patch along those lines. I have a few "niggles" I'd like feedback on, but in general I'm happy with it.

Previous: Junio C Hamano
Message 5 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.