From: Miklos Vajna Date: Sun, 15 Jun 2008 20:34:38 GMT Subject: Re: Working with Git and CVS in a team. Message-ID: <20080615203438.GV29404@genesis.frugalware.org> In-Reply-To: <200806152220.05290.me@misto.ch> On Sun, Jun 15, 2008 at 10:20:05PM +0200, Mirko Stocker wrote: > Hm, git-cvsimport created a master and an origin branch. And then I push the > origin branch to the bare repository to share it with my colleagues. So for > the users, origin/origin contains the original CVS content, so we need to > make the diff against that, don't we? That's how I think this whole thing > works, I might be wrong :-) Oh, you are right. Sorry for the noise. I forgot that git-cvsimport creates an origin branch without -o master.