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

Re: [PATCH] mergetool: add an option for writing to a temporary directory

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 13, 2014, 19:24 UTC
Message-ID
<xmqqk3433h8m.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1413047085-12398-1-git-send-email-davvid@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 5 quoted lines
> Teach mergetool to write files in a temporary directory when
> 'mergetool.writeToTemp' is true.
>
> This is helpful for tools such as Eclipse which cannot cope with
> multiple copies of the same file in the worktree.

With this can we drop the "change the temporary file name" patch by Robin Rosenberg?

http://thread.gmane.org/gmane.comp.version-control.git/255457/focus=255599
Message-Id: <1408607240-11369-1-git-send-email-robin.rosenberg@dewire.com>
Previous: Junio C HamanoNext: David Aguilar
Message 3 of 6 in “mergetool: add an option for writing to a temporary directory”
  1. mergetool: add an option for writing to a temporary directoryDavid Aguilar, Oct 11, 2014
  2. Junio C HamanoOct 13, 2014
  3. Junio C HamanoOct 13, 2014
  4. David AguilarOct 15, 2014
  5. Robin RosenbergOct 15, 2014
  6. Junio C HamanoOct 15, 2014

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.