From: "Dmitry Potapov" <dpotapov@gmail.com>
To: "Charles Bailey" <charles@hashpling.org>
Cc: "Gregory Jefferis" <jefferis@gmail.com>, git@vger.kernel.org
Subject: Re: Stitching together private svn repo and public git repo
Date: Thu, 3 Jan 2008 01:13:54 +0300 [thread overview]
Message-ID: <37fcd2780801021413g5f2a602dkb9fc289a13517375@mail.gmail.com> (raw)
In-Reply-To: <20080102214005.GA10924@hashpling.org>
On Jan 3, 2008 12:40 AM, Charles Bailey <charles@hashpling.org> wrote:
> You could then do this with a 'git filter-branch --parent-filter' to
> rewrite the parents of the merge commits. As far as I can see, you
> would need to call filter-branch once per merge to rewrite everything
> from the merge commit forwards.
I believe there is a much easier way to do that using .git/info/grafts
The first step is to create .git/info/grafts, which specifies commit-id
and its parents for each commit that you want to change. Then you
can check the result using gitk, and if you are satisfied with what
you see then you run git filter-branch on it to convert 'fake' parents
into real ones.
Dmitry
next prev parent reply other threads:[~2008-01-02 22:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-02 19:25 Stitching together private svn repo and public git repo Gregory Jefferis
2008-01-02 21:40 ` Charles Bailey
2008-01-02 22:13 ` Dmitry Potapov [this message]
2008-01-02 22:46 ` Charles Bailey
2008-01-03 14:43 ` Gregory Jefferis
2008-01-03 17:24 ` Junio C Hamano
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=37fcd2780801021413g5f2a602dkb9fc289a13517375@mail.gmail.com \
--to=dpotapov@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=jefferis@gmail.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).