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

Re: [PATCH] git-gui: handle symlink replaced by file

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Nov 3, 2010, 20:07 UTC
Message-ID
<AANLkTi=P+sKzYSkeS2-N+DerP3zdRgrDnuNuXbK0O89s@mail.gmail.com>
In-Reply-To
<8739rqqb4m.fsf@fox.patthoyts.tk>

On Thu, Oct 28, 2010 at 14:27, Pat Thoyts <patthoyts@users.sourceforge.net> wrote:

> This patch just handles the second segment without generating the error
> really. It doesn't attempt to do any pretty output.

Thanks for the patch. I haven't test it yet. Actually I can't find documentation, that git outputs two diffs when the path changes the type. And I have no idea how to present this in git gui.

Bert
Previous: Pat ThoytsNext: Bert Wesarg
Message 3 of 4 in “git-gui: 'Unhandled 2 way diff marker:' for typechanged path”
  1. Bert WesargOct 25, 2010
  2. git-gui: handle symlink replaced by filePat Thoyts, Oct 28, 2010
  3. Bert WesargNov 3, 2010
  4. Bert WesargDec 6, 2010

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.