2009/10/9 Avery Pennarun <apenwarr@xxxxxxxxx>: > On Fri, Oct 9, 2009 at 5:33 PM, Howard Miller > <howard@xxxxxxxxxxxxxxxxxxx> 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 > Adding Unix ignorance to git ignorance... doesn't that delete the .git directory too? I don't have cp -a (on a mac) but, IIRC, that's just -rp or somesuch? But I see, basic idea is to ditch the files, replace them with the new vendor release a commit. I did think of that but it seemed too simple :-) Cheers. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html