git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging non-git releases of a project

From
Avery Pennarun <apenwarr@gmail.com>
Date
Oct 9, 2009, 22:43 UTC
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:

Show 6 quoted lines
> 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
Previous: Howard MillerNext: Peter Baumann
Message 4 of 9 in “Merging non-git releases of a project”
  1. Howard MillerOct 9, 2009
  2. Avery PennarunOct 9, 2009
  3. Howard MillerOct 9, 2009
  4. Avery PennarunOct 9, 2009
  5. Peter BaumannOct 10, 2009
  6. Björn SteinbrinkOct 10, 2009
  7. Peter BaumannOct 10, 2009
  8. Howard MillerOct 10, 2009
  9. Avery PennarunOct 11, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.