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

Re: resolve (merge) problems

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Dec 2, 2005, 00:07 UTC
Message-ID
<20051202000715.8100.qmail@web31810.mail.mud.yahoo.com>
In-Reply-To
<7v3blccqtz.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
> Easier to read is:
> 
> 	$ git-diff-files --name-status
Ok this is what it shows:

$git-diff-files --name-status U arch/arm/configs/poodle_defconfig D arch/arm/configs/poodle_defconfig U drivers/atm/atmdev_init.c D drivers/atm/atmdev_init.c

Unmerged and deleted?  Is this correct?
    Luben
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 11 in “resolve (merge) problems”
  1. Luben TuikovDec 1, 2005
  2. Junio C HamanoDec 1, 2005
  3. Luben TuikovDec 2, 2005
  4. Junio C HamanoDec 2, 2005
  5. Luben TuikovDec 2, 2005
  6. Junio C HamanoDec 2, 2005
  7. Luben TuikovDec 2, 2005
  8. Junio C HamanoDec 2, 2005
  9. Luben TuikovDec 2, 2005
  10. Linus TorvaldsDec 2, 2005
  11. Luben TuikovDec 2, 2005

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.