On Fri, Jun 13, 2008 at 10:43:36PM +0200, Mirko Stocker <m1stocke@hsr.ch> wrote:
> > Don't you mean origin/master?
> 
> Hm, I'm not sure.. if I work on an a feature in a branch, and now I want to 
> create a patch that applies to the CVS head, then I have to make the diff to 
> origin/origin, right?

'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').