git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: "Derek Mahar" <derek.mahar@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-cvsexportcommit and commit date
Date: Sun, 10 Feb 2008 14:15:00 +0100	[thread overview]
Message-ID: <200802101415.00726.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <5f4b18bf0802092213r4bd1df2ap7d2649dd9251fbb7@mail.gmail.com>

söndagen den 10 februari 2008 skrev Derek Mahar:
> 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

  reply	other threads:[~2008-02-10 13:16 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <OFFF18703C.5539A99A-ON852573E7.00699FE4-852573E7.006A0F3E@db.com>
2008-02-06 19:51 ` git-cvsexportcommit and commit date Martin Langhoff
2008-02-10  3:53   ` Derek Mahar
2008-02-10  5:45     ` Robin Rosenberg
2008-02-10  6:01       ` Derek Mahar
2008-02-10  6:13         ` Derek Mahar
2008-02-10 13:15           ` Robin Rosenberg [this message]
2008-02-10 16:01             ` Derek Mahar
2008-02-10 16:17               ` Robin Rosenberg
2008-02-10 16:30                 ` Derek Mahar
     [not found] <OFEEDE9683.291E2C34-ON852573E2.00555C6A-852573E2.0055C505@db.com>
2008-02-01 23:50 ` Martin Langhoff

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=200802101415.00726.robin.rosenberg.lists@dewire.com \
    --to=robin.rosenberg.lists@dewire.com \
    --cc=derek.mahar@gmail.com \
    --cc=git@vger.kernel.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 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 NNTP newsgroup(s).