Re: rebase hint unmerged file removed

From: Jeff King <peff@peff.net>
Date: Aug 24, 2009, 14:36 UTC
Message-ID: <20090824143657.GA12809@coredump.intra.peff.net>
In-Reply-To: <20090824140549.GA3973@debian.b2j>

On Mon, Aug 24, 2009 at 10:05:49PM +0800, bill lam wrote:

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?

The version of "git status" in next (and presumably what will be in v1.6.5) shows unmerged paths with more information. In this case, you would see something like:

  $ echo content >foo && git add foo && git commit -m 'base foo'
  $ echo changes >>foo && git add foo && git commit -m 'change foo'
  $ git checkout -b other HEAD^
  $ git rm foo && git commit -m 'remove foo'
  $ git rebase master
  $ git status
  # Unmerged paths:
  #   (use "git reset HEAD <file>..." to unstage)
  #   (use "git add <file>..." to mark resolution)
  #
  #       deleted by them:    foo
  #

-Peff