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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 17, 2008, 11:08 UTC
Message-ID
<7vmypz262w.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<b63a66ef2a97cd3e791476a74bdb7081bcd57637.1203242325.git.charles@hashpling.org>
Charles Bailey <charles@hashpling.org> writes:
> This series of patches are a cleaned and improved version of the
> earlier RFC patch that I sent.

About the organization of the series, I think (note that what I think does not count as much as what Ted thinks around this area) it would make much more sense to do 4 first (unless there is a reason why it behaves differently for existing backends), then 2 (remove $path everywhere and use $MERGED consistently, not just where you call out to the custom tool), and then finally 1. The general idea is to clean-up first and then add features on solidified base.

I do not personally see much need for 3, as the custom script should be able to check the situation and adjust its behaviour accordingly, and that way you do not have to maintain two scripts. I.e. if $BASE does not exist, there is no base, no?

Previous: Charles Bailey
Message 5 of 5 in “Teach git mergetool to use custom commands defined at config time”
  1. 1/4 Teach git mergetool to use custom commands defined at config timeCharles Bailey, Feb 17, 2008
  2. 2/4 Changed the documented variable for mergetool's target fileCharles Bailey, Feb 17, 2008
  3. 3/4 Allow a different mergetool command to be used for 'no base' mergesCharles Bailey, Feb 17, 2008
  4. 4/4 Tidy up git mergetool's handling of backup filesCharles Bailey, Feb 17, 2008
  5. Junio C HamanoFeb 17, 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.