From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 04 Feb 2007 03:50:37 GMT
Subject: Re: merge doesn't remove files
Message-ID: <20070204035037.GB16766@spearce.org>
In-Reply-To: <7vy7nezr1f.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> wrote:
> Gerrit Pape <pape@smarden.org> writes:
> 
> > Shouldn't git remove the original file after merging a commit that moved
> > the file away?
> 
> I think this has been fixed quite a while ago --- does not seem
> to reproduce with the current v1.5.0-rc.

Indeed, this commit of mine was supposed to fix it:

  commit 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
  Author: Shawn Pearce <spearce@spearce.org>
  Date:   Wed Dec 13 05:42:44 2006 -0500

Its in 1.5.0-rc0, but nothing earlier.

-- 
Shawn.