From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Sat, 10 Oct 2009 09:00:53 GMT
Subject: Re: Merging non-git releases of a project
Message-ID: <20091010090053.GA4843@atjola.homenet>
In-Reply-To: <20091010084742.GB17220@m62s10.vlinux.de>

On 2009.10.10 10:47:42 +0200, Peter Baumann wrote:
> On Fri, Oct 09, 2009 at 06:43:50PM -0400, Avery Pennarun wrote:
> > Try this:
> > 
> >    cd mygitproject
> >    git rm -rf .
> >    cp -a /tmp/wherever/vendor-1.2/. .
> >    git add .
> 
> This won't commit deleted files from v1.0 - v1.2. Use git add -A to stage all
> modified and deleted files for the next commit.

It will, the "git rm" already cleans the index.

Björn