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

Re: rebase hint unmerged file removed

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 24, 2009, 14:42 UTC
Message-ID
<4A92A6E6.5060702@viscovery.net>
In-Reply-To
<20090824140549.GA3973@debian.b2j>
bill lam schrieb:
Show 5 quoted lines
> Sometimes during rebase -i, it stopped with an unmerged file but that
> file did not have any sections of conflict marked.  ls-files showed it
> had :1: and :2: but no :3:  I suspected that file was git-rm in that
> commit.  Will it be possible for git status or rebase to give hint
> that unmerged file was actually removed?

Rebase -i emitted used to write merge-recursive's conflict hints that said "modify/delete", "modify/rename", "content", etc. I think that's what you were looking for. But these hints have vanished since quite some time now. I haven't taken the time, yet, to track down when this happened and why.

-- Hannes
Previous: bill lamNext: Johannes Sixt
Message 4 of 6 in “rebase hint unmerged file removed”
  1. bill lamAug 24, 2009
  2. Jeff KingAug 24, 2009
  3. bill lamAug 25, 2009
  4. Johannes SixtAug 24, 2009
  5. Johannes SixtAug 25, 2009
  6. Miklos VajnaAug 25, 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.