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

Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.

From
Johannes Sixt <johannes.sixt@telecom.at>
Date
Mar 3, 2007, 20:39 UTC
Message-ID
<200703032139.12869.johannes.sixt@telecom.at>
In-Reply-To
<Pine.LNX.4.63.0703032110200.22628@wbgn013.biozentrum.uni-wuerzburg.de>
On Saturday 03 March 2007 21:11, Johannes Schindelin wrote:
> I think regardless of the value of core.symlinks, merging symbolic links
> does not make sense at all.

No doubt about that. Currently, the version of the "current" branch remains in the working tree. My patch does not change this behavior at all, it just does not call symlink(2), but allocates a regular file.

-- Hannes
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 4 of 7 in “Handle core.symlinks=false case in merge-recursive.”
  1. 1/2 Handle core.symlinks=false case in merge-recursive.Johannes Sixt, Mar 3, 2007
  2. 2/2 Tell multi-parent diff about core.symlinks.Johannes Sixt, Mar 3, 2007
  3. Johannes SchindelinMar 3, 2007
  4. Johannes SixtMar 3, 2007
  5. Johannes SchindelinMar 3, 2007
  6. Johannes SixtMar 3, 2007
  7. Junio C HamanoMar 4, 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.