From: "Derek Mahar" <derek.mahar@gmail.com>
To: "Robin Rosenberg" <robin.rosenberg.lists@dewire.com>
Cc: git@vger.kernel.org
Subject: Re: git-cvsexportcommit and commit date
Date: Sun, 10 Feb 2008 01:01:42 -0500 [thread overview]
Message-ID: <5f4b18bf0802092201i24f7de39o3fea28823621fdd1@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2008-02-10 6:02 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 [this message]
2008-02-10 6:13 ` Derek Mahar
2008-02-10 13:15 ` Robin Rosenberg
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=5f4b18bf0802092201i24f7de39o3fea28823621fdd1@mail.gmail.com \
--to=derek.mahar@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg.lists@dewire.com \
/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).