From: Mirko Stocker Date: Fri, 13 Jun 2008 20:47:03 GMT Subject: Re: Working with Git and CVS in a team. Message-ID: <200806132247.03947.m1stocke@hsr.ch> In-Reply-To: <20080613160911.GB3140@sigill.intra.peff.net> On Friday 13 June 2008 18:09:11 Jeff King wrote: > On Fri, Jun 13, 2008 at 04:33:34PM +0200, Mirko Stocker wrote: > > 1) I use git-cvsimport to update the repository every night. /git-proj > > is a "clone --bare" of the /from-cvs repository. > > > > 2) After the import, I push the changes from CVS to /git-proj using > > 'git push /git-proj origin'. > > You could simplify this by just cvsimporting to an 'upstream' branch in > git-proj. Hm, I've tried that, but it doesnt seem to work.. git-proj is a bare repository, and git-cvsimport always creates a new .git in it. I'm using the -C option to specify the target. Is anything else needed? Regards Mirko