From: Peter Baumann <waste.manager@gmx.de>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Avery Pennarun <apenwarr@gmail.com>,
Howard Miller <howard@e-learndesign.co.uk>,
git@vger.kernel.org
Subject: Re: Merging non-git releases of a project
Date: Sat, 10 Oct 2009 12:04:58 +0200 [thread overview]
Message-ID: <20091010100458.GC17220@m62s10.vlinux.de> (raw)
In-Reply-To: <20091010090053.GA4843@atjola.homenet>
On Sat, Oct 10, 2009 at 11:00:53AM +0200, Björn Steinbrink wrote:
> On 2009.10.10 10:47:42 +0200, Peter Baumann wrote:
> > 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.
>
You are right. I missed the "git" part and read only rm -rf.
-Peter
next prev parent reply other threads:[~2009-10-10 10:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 21:11 Merging non-git releases of a project Howard Miller
2009-10-09 21:27 ` Avery Pennarun
2009-10-09 21:33 ` Howard Miller
2009-10-09 22:43 ` Avery Pennarun
2009-10-10 8:47 ` Peter Baumann
2009-10-10 9:00 ` Björn Steinbrink
2009-10-10 10:04 ` Peter Baumann [this message]
2009-10-10 8:58 ` Howard Miller
2009-10-11 15:32 ` Avery Pennarun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091010100458.GC17220@m62s10.vlinux.de \
--to=waste.manager@gmx.de \
--cc=B.Steinbrink@gmx.de \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=howard@e-learndesign.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).