From: Miklos Vajna <vmiklos@frugalware.org>
To: Samuel Lucas Vaz de Mello <samuellucas@datacom.ind.br>
Cc: git@vger.kernel.org
Subject: Re: Removing part of the history
Date: Fri, 28 Nov 2008 22:34:54 +0100 [thread overview]
Message-ID: <20081128213454.GE19355@genesis.frugalware.org> (raw)
In-Reply-To: <49306150.6010701@datacom.ind.br>
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
On Fri, Nov 28, 2008 at 07:23:28PM -0200, Samuel Lucas Vaz de Mello <samuellucas@datacom.ind.br> wrote:
> There is any way to get rid of the (broken) cvs-old tree?
>
> I've tried to rebase, but the commits from A' and A are different, it
> tries to reapply all history in CVS.
Have you tried git rebase --onto?
> I've tried to checkout a point before our changes start (B') and then,
> using a script, cherry-pick all commits up to HEAD that are not in
> cvs-old branch. This approach didn't handled well merges between our
> branches (K-L-M and X-Y).
git rebase --preserve-merges is probably what you are searching for.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-11-28 21:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-28 21:23 Removing part of the history Samuel Lucas Vaz de Mello
2008-11-28 21:34 ` Miklos Vajna [this message]
2008-11-28 22:38 ` Jakub Narebski
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=20081128213454.GE19355@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=samuellucas@datacom.ind.br \
/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