git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Miklos Vajna <vmiklos@frugalware.org>
To: Mirko Stocker <m1stocke@hsr.ch>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Working with Git and CVS in a team.
Date: Fri, 13 Jun 2008 22:47:40 +0200	[thread overview]
Message-ID: <20080613204740.GA29404@genesis.frugalware.org> (raw)
In-Reply-To: <200806132243.36695.m1stocke@hsr.ch>

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-06-13 20:48 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 [this message]
2008-06-15 20:20       ` Mirko Stocker
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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080613204740.GA29404@genesis.frugalware.org \
    --to=vmiklos@frugalware.org \
    --cc=git@vger.kernel.org \
    --cc=m1stocke@hsr.ch \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).