Re: Working with Git and CVS in a team.

On Friday 13 June 2008 22:47:40 Miklos Vajna wrote:

'origin/origin' means the 'origin' branch of the 'origin' remote. Given
that you said you created the 'origin' remote's repo using
git-cvsimport, I assumed that the 'origin' remote has only one branch
(named 'master').

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 :-)