söndagen den 10 februari 2008 skrev Derek Mahar: > On Feb 10, 2008 1:01 AM, Derek Mahar <derek.mahar@xxxxxxxxx> wrote: > > On Feb 10, 2008 12:45 AM, Robin Rosenberg > > <robin.rosenberg.lists@xxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
