All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mirko Stocker <me@misto.ch>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: "Stocker Mirko (m1stocke@hsr.ch)" <m1stocke@hsr.ch>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Working with Git and CVS in a team.
Date: Sun, 15 Jun 2008 22:20:05 +0200	[thread overview]
Message-ID: <200806152220.05290.me@misto.ch> (raw)
In-Reply-To: <20080613204740.GA29404@genesis.frugalware.org>

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

  reply	other threads:[~2008-06-15 20:25 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-13 14:33 Working with Git and CVS in a team Mirko Stocker
2008-06-13 14:50 ` Miklos Vajna
2008-06-13 20:43   ` Mirko Stocker
2008-06-13 20:47     ` Miklos Vajna
2008-06-15 20:20       ` Mirko Stocker [this message]
2008-06-15 20:34         ` Miklos Vajna
2008-06-16 16:04     ` John J. Franey
2008-06-16 16:44       ` Jakub Narebski
2008-06-13 16:09 ` Jeff King
2008-06-13 20:47   ` Mirko Stocker
2008-06-13 20:55     ` Jeff King
2008-06-15 20:22       ` Mirko Stocker
2008-06-15 20:48         ` Jeff King
2008-06-16 13:39           ` Mirko Stocker

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=200806152220.05290.me@misto.ch \
    --to=me@misto.ch \
    --cc=git@vger.kernel.org \
    --cc=m1stocke@hsr.ch \
    --cc=vmiklos@frugalware.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.