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

Re: [RFC/PATCH] Teach git mergetool to use custom commands defined at config time

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 17, 2008, 00:46 UTC
Message-ID
<alpine.LSU.1.00.0802170045210.30505@racer.site>
In-Reply-To
<20080217002029.GA504@hashpling.org>
Hi,
On Sun, 17 Feb 2008, Charles Bailey wrote:
Show 12 quoted lines
> On Sat, Feb 16, 2008 at 11:37:31PM +0100, Steffen Prohaska wrote:
> 
> > Why not just add the tools you have in mind to git mergetool?  If 
> > everyone did that eventually we would have direct support for a rather 
> > long list of tools.  This would be the easiest solution for the end 
> > user: He could just choose the preferred tool and use it.  The 
> > invocation of each merge tool would be coded in mergetool.  The exact 
> > command line could be fine tuned and would be reviewed by other git 
> > developers.
> > 
> 
> I have to disagree with this approach.

So you'd rather have the end users do the same work for the same tool over and over again?

Ciao, Dscho

Previous: Charles BaileyNext: Charles Bailey
Message 7 of 16 in “Teach git mergetool to use custom commands defined at config time”
  1. Teach git mergetool to use custom commands defined at config timeCharles Bailey, Feb 16, 2008
  2. Junio C HamanoFeb 16, 2008
  3. Charles BaileyFeb 16, 2008
  4. Jakub NarebskiFeb 16, 2008
  5. Steffen ProhaskaFeb 16, 2008
  6. Charles BaileyFeb 17, 2008
  7. Johannes SchindelinFeb 17, 2008
  8. Charles BaileyFeb 17, 2008
  9. Junio C HamanoFeb 17, 2008
  10. Steffen ProhaskaFeb 17, 2008
  11. Charles BaileyFeb 17, 2008
  12. Theodore TsoFeb 17, 2008
  13. Charles BaileyFeb 17, 2008
  14. Charles BaileyFeb 17, 2008
  15. Junio C HamanoFeb 18, 2008
  16. Charles BaileyFeb 18, 2008

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.