From: Michael J Gruber <git@drmicha•warpmail.net>
To: Brice Ruth <bdruth@gmail•com>, Git Mailing List <git@vger•kernel.org>
Subject: Re: Help with rebase after cvsimport
Date: Sat, 27 Mar 2010 18:22:29 +0100 [thread overview]
Message-ID: <4BAE3ED5.6080808@drmicha.warpmail.net> (raw)
In-Reply-To: <bcd06dea1003260910h6e27fdfbh9f968bf5ca4c1b6e@mail.gmail.com>
Brice Ruth venit, vidit, dixit 26.03.2010 17:10:
> So, when you write "Note that by doing that you basically discard your
> version of commits which made the git-cvs-git roundtrip" - I will lose
> the individual commits I made locally and I'll just see the *one*
> exportcommit that I made for my local changes, is that right?
The way I use git-cvs, I have one cvs commit per git commit. Are you
using it differently?
The rebase will discard those commits whose patch text is already
"present" on the branch. I assume that for a cumulative patch this means
it's not ignored - in that case the rebase won't buy you anything.
Michael
prev parent reply other threads:[~2010-03-27 17:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <bcd06dea1003250935q324b2412g959309070491c73c@mail.gmail.com>
2010-03-25 17:37 ` Help with rebase after cvsimport Brice Ruth
2010-03-26 9:17 ` Michael J Gruber
[not found] ` <bcd06dea1003260910h6e27fdfbh9f968bf5ca4c1b6e@mail.gmail.com>
2010-03-27 17:22 ` Michael J Gruber [this message]
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=4BAE3ED5.6080808@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=bdruth@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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