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

Re: [PATCH] Added mergetool.kdiff3.doubledash config option

From
Theodore Tso <tytso@mit.edu>
Date
Jun 13, 2008, 14:58 UTC
Message-ID
<20080613145803.GE24675@mit.edu>
In-Reply-To
<911589C97062424796D53B625CEC0025E46159@USCOBRMFA-SE-70.northamerica.cexp.com>
On Thu, Jun 12, 2008 at 04:44:03PM -0600, Patrick.Higgins@cexp.com wrote:
Show 8 quoted lines
> I have found the following to be a way to distinguish the two
> versions based solely on exit status. The broken one exits with 255.
> 
> kdiff3 --auto -o /dev/null -- /dev/null /dev/null
> 
> I'll work up another patch that uses this. This check adds about
> 0.5s overhead. That seems a little high to me, but given that
> mergetool is interactive, I guess that could be acceptable.

Hmm, do we have a policy about whether or not it is acceptable to modify .gitconfig behind the user's back? It would be nice if the check would be done once and then the result gets cached. So if not in .gitconfig, maybe somewhere else.

      	       	    	     	      - Ted
Previous: patrick.higgins@cexp.comNext: Junio C Hamano
Message 4 of 6 in “Added mergetool.kdiff3.doubledash config option”
  1. Added mergetool.kdiff3.doubledash config optionPatrick Higgins, Jun 12, 2008
  2. Junio C HamanoJun 12, 2008
  3. patrick.higgins@cexp.comJun 12, 2008
  4. Theodore TsoJun 13, 2008
  5. Junio C HamanoJun 14, 2008
  6. Theodore TsoJun 14, 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.