From: Derek Mahar <derek.mahar@gmail.com>
Date: Sun, 10 Feb 2008 06:13:42 GMT
Subject: Re: git-cvsexportcommit and commit date
Message-ID: <5f4b18bf0802092213r4bd1df2ap7d2649dd9251fbb7@mail.gmail.com>
In-Reply-To: <5f4b18bf0802092201i24f7de39o3fea28823621fdd1@mail.gmail.com>

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.

Derek