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

On Feb 10, 2008 12:45 AM, Robin Rosenberg
<robin.rosenberg.lists@dewire.com> wrote:
> söndagen den 10 februari 2008 skrev Derek Mahar:
> > How do you get git-cvsimport to avoid the "duplicate" commit that it creates
> > when it imports a commit that you "landed" in CVS with git-cvsexportcommit?
>
> 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.

Derek