From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 24 Aug 2009 14:42:46 GMT
Subject: Re: rebase hint unmerged file removed
Message-ID: <4A92A6E6.5060702@viscovery.net>
In-Reply-To: <20090824140549.GA3973@debian.b2j>

bill lam schrieb:
> 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