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

Re: git-cvsexportcommit and commit date

From
Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date
Feb 10, 2008, 13:15 UTC
Message-ID
<200802101415.00726.robin.rosenberg.lists@dewire.com>
In-Reply-To
<5f4b18bf0802092213r4bd1df2ap7d2649dd9251fbb7@mail.gmail.com>
söndagen den 10 februari 2008 skrev Derek Mahar:
Show 14 quoted lines
> On Feb 10, 2008 1:01 AM, Derek Mahar <derek.mahar@gmail.com> wrote:
> > On Feb 10, 2008 12:45 AM, Robin Rosenberg
> > <robin.rosenberg.lists@dewire.com> wrote:
> > > git rebase will drop those "empty" commits by default and you'll end up with the
> > > cvs-imported version.
> >
> > How do I perform this rebase if the empty commit is on the same
> > branch, say the master branch, as the original CVS landed commit?  I
> > attempted such a git-rebase using 1.5.4, but, iirc, git-rebase
> > responded that the branch was already up-to-date.
> 
> On second thought, I don't recall with what message git-rebase
> responded, but I do recall that the commit was still on the master
> branch.

As I recall it (I'm using fromcvs, not git-cvsimport) cvs HEAD get imported into origin which on initial import gets copied to master. So I think you should git rebase origin

-- robin
Previous: Derek MaharNext: Derek Mahar
Message 6 of 9 in “Re: git-cvsexportcommit and commit date”
  1. Martin LanghoffFeb 6, 2008
  2. Derek MaharFeb 10, 2008
  3. Robin RosenbergFeb 10, 2008
  4. Derek MaharFeb 10, 2008
  5. Derek MaharFeb 10, 2008
  6. Robin RosenbergFeb 10, 2008
  7. Derek MaharFeb 10, 2008
  8. Robin RosenbergFeb 10, 2008
  9. Derek MaharFeb 10, 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.