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

diff: unmerged path?

From
Jon Smirl <jonsmirl@gmail.com>
Date
Mar 31, 2009, 02:47 UTC
Message-ID
<9e4733910903301947g20ade881q6a49f9cd8731b8f4@mail.gmail.com>
What does it mean when I have an unmerged path?
jonsmirl@terra:/home/apps/u-boot$ git diff
* Unmerged path api_examples/intellon.c
jonsmirl@terra:/home/apps/u-boot$
api_examples/intellon.c is a newly created file under stgit.
-- 
Jon Smirl
jonsmirl@gmail.com
Message 1 of 1 in “diff: unmerged path?”
  1. Jon SmirlMar 31, 2009

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.