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

Re: [RFC PATCH] mergetools: support difftool.tabbed setting

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 12, 2021, 22:21 UTC
Message-ID
<xmqqmtw9udue.fsf@gitster.c.googlers.com>
In-Reply-To
<CAJDDKr4zM1ZuNc+JpQnAtqwa5Ljv7_5bL3X-cC3e5Xg3z2Cbcw@mail.gmail.com>
David Aguilar <davvid@gmail.com> writes:
> I'm not really sure if "tabbed" is the best name for what's going on,
> though.  It's really more of a "diff everything in one shot" mode, and
> it just so happens that the tools in question use tabs.
This statement matches my reaction to this new feature exactly.

The way the external commands are triggered via GIT_EXTERNAL_DIFF mechanism makes it "easy" to show changes for one path at a time and "hard" to do so for all paths at once, but the resulting end-user experience that is forced to view one path at a time may be awkward.

> That said, I wonder whether we need this new feature, or whether we
> should instead improve an existing one.  I'm leaning towards improving
> the existing dir-diff feature as a better alternative. ...

As a non-user, I have no strong opinion on the "new feature"; other than that I trust your judgement on the "difftool" design issues, that is.

Thanks.
Previous: David Aguilar
Message 14 of 14 in “mergetools: support difftool.tabbed setting”
  1. mergetools: support difftool.tabbed settingNicholas Guriev, Jan 13, 2021
  2. 0/3 implement tabbed mode in difftoolsNicholas Guriev, Jan 18, 2021
  3. 2/3 difftool-helper: conciliate difftool.tabbed and difftool.prompt settingsNicholas Guriev, Jan 18, 2021
  4. 1/3 mergetools: support difftool.tabbed settingNicholas Guriev, Jan 18, 2021
  5. Junio C HamanoJan 18, 2021
  6. 3/3 doc: describe new difftool.tabbed featureNicholas Guriev, Jan 18, 2021
  7. 0/4 difftools in tabbed modeNicholas Guriev, Jan 25, 2021
  8. 4/4 t7800: new tests of difftool.tabbed featureNicholas Guriev, Jan 25, 2021
  9. 3/4 doc: describe new difftool.tabbed featureNicholas Guriev, Jan 25, 2021
  10. 1/4 mergetools: support difftool.tabbed settingNicholas Guriev, Jan 25, 2021
  11. 2/4 difftool-helper: conciliate difftool.tabbed and difftool.prompt settingsNicholas Guriev, Jan 25, 2021
  12. Junio C HamanoJan 25, 2021
  13. David AguilarFeb 12, 2021
  14. Junio C HamanoFeb 12, 2021

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.