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

Re: Help with rebase after cvsimport

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Mar 27, 2010, 17:22 UTC
Message-ID
<4BAE3ED5.6080808@drmicha.warpmail.net>
In-Reply-To
<bcd06dea1003260910h6e27fdfbh9f968bf5ca4c1b6e@mail.gmail.com>
Brice Ruth venit, vidit, dixit 26.03.2010 17:10:
> So, when you write "Note that by doing that you basically discard your
> version of commits which made the git-cvs-git roundtrip" - I will lose
> the individual commits I made locally and I'll just see the *one*
> exportcommit that I made for my local changes, is that right?

The way I use git-cvs, I have one cvs commit per git commit. Are you using it differently?

The rebase will discard those commits whose patch text is already "present" on the branch. I assume that for a cumulative patch this means it's not ignored - in that case the rebase won't buy you anything.

Michael
Previous: Michael J Gruber
Message 3 of 3 in “Help with rebase after cvsimport”
  1. Brice RuthMar 25, 2010
  2. Michael J GruberMar 26, 2010
  3. Michael J GruberMar 27, 2010

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.