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

Re: Merging non-git releases of a project

From
Björn Steinbrink <b.steinbrink@gmx.de>
Date
Oct 10, 2009, 09:00 UTC
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:
Show 10 quoted lines
> 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
Previous: Peter BaumannNext: Peter Baumann
Message 6 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.