git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Working with Git and CVS in a team.

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 13, 2008, 20:47 UTC
Message-ID
<20080613204740.GA29404@genesis.frugalware.org>
In-Reply-To
<200806132243.36695.m1stocke@hsr.ch>
On Fri, Jun 13, 2008 at 10:43:36PM +0200, Mirko Stocker <m1stocke@hsr.ch> wrote:
Show 5 quoted lines
> > 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').

Previous: Mirko StockerNext: Mirko Stocker
Message 4 of 14 in “Working with Git and CVS in a team.”
  1. Mirko StockerJun 13, 2008
  2. Miklos VajnaJun 13, 2008
  3. Mirko StockerJun 13, 2008
  4. Miklos VajnaJun 13, 2008
  5. Mirko StockerJun 15, 2008
  6. Miklos VajnaJun 15, 2008
  7. John J. FraneyJun 16, 2008
  8. Jakub NarebskiJun 16, 2008
  9. Jeff KingJun 13, 2008
  10. Mirko StockerJun 13, 2008
  11. Jeff KingJun 13, 2008
  12. Mirko StockerJun 15, 2008
  13. Jeff KingJun 15, 2008
  14. Mirko StockerJun 16, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.