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

Re: [PATCH] Teach git-mergetool about Apple's opendiff/FileMerge

From
Steven Grimm <koreth@midwinter.com>
Date
Mar 23, 2007, 04:52 UTC
Message-ID
<46035D0B.8020009@midwinter.com>
In-Reply-To
<7vbqiksh4a.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
>> +                opendiff $LOCAL $REMOTE -merge $path | cat
> What's the purpose of this cat anyway?  It looks like an
> expensive no-op to me.
>

If stdout is a tty, opendiff appears to background itself automatically. I assume he wanted to prevent that without losing any output from the command.

-Steve
Previous: Junio C HamanoNext: Arjen Laarhoven
Message 3 of 7 in “Teach git-mergetool about Apple's opendiff/FileMerge”
  1. Teach git-mergetool about Apple's opendiff/FileMergeArjen Laarhoven, Mar 22, 2007
  2. Junio C HamanoMar 23, 2007
  3. Steven GrimmMar 23, 2007
  4. Arjen LaarhovenMar 23, 2007
  5. Theodore TsoMar 23, 2007
  6. Marco RoelandMar 23, 2007
  7. Theodore TsoMar 29, 2007

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.