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

Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts

From
BHBruno Haible <bruno@clisp.org>
Date
Sep 30, 2007, 21:25 UTC
Message-ID
<200709302325.56235.bruno@clisp.org>
In-Reply-To
<7vk5q7hqld.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> The script needs to decide how it wants to present an unmerged
> path; the information on each unmerged stages can be read from
> the output of "ls-files -u $thatpath".
Thanks for this info. This, and "git cat-file", did the trick.
Bruno
Previous: Junio C Hamano
Message 3 of 3 in “GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts”
  1. Bruno HaibleSep 30, 2007
  2. Junio C HamanoSep 30, 2007
  3. Bruno HaibleSep 30, 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.