Re: Merging non-git releases of a project

On Fri, Oct 09, 2009 at 06:43:50PM -0400, Avery Pennarun wrote:

On Fri, Oct 9, 2009 at 5:33 PM, Howard Miller
[off-list ref] wrote:

quoted

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 .

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.

   git commit

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