From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 09 Oct 2009 22:43:50 GMT
Subject: Re: Merging non-git releases of a project
Message-ID: <32541b130910091543x19b3b46an109f90be5c5bfaa2@mail.gmail.com>
In-Reply-To: <26ae428a0910091433v2c959a70g9bfc6c54382f370d@mail.gmail.com>

On Fri, Oct 9, 2009 at 5:33 PM, Howard Miller
<howard@e-learndesign.co.uk> wrote:
> I'm missing the point here though. Where/when  do I actually add the
> new pristine code? If I checkout, as you suggest, my initial commit I
> just have (say) v1.0 of the vendor's code. I can't just copy (say)
> version 1.2 on top as the files probably won't match one-one.
>
> Sorry - I'm probably completely failing to understand.

Try this:

   cd mygitproject
   git rm -rf .
   cp -a /tmp/wherever/vendor-1.2/. .
   git add .
   git commit

Don't worry, git won't double-store files that are identical between
the old 1.0 and new 1.2 versions.

Avery