From: Johannes Sixt <j.sixt@viscovery.net>
To: bill lam <cbill.lam@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: combine git repo historically
Date: Fri, 09 Oct 2009 08:02:44 +0200 [thread overview]
Message-ID: <4ACED204.3000907@viscovery.net> (raw)
In-Reply-To: <20091009012254.GA3980@debian.b2j>
bill lam schrieb:
> I have two git repos, no branches.
>
> repo 1.
> emptyrootcommit -- A ... M
>
> repo 2.
> emptyrootcommit -- N ... Z
>
> N was evolved from M but the time gap is large, how can I combine them
> into one repo
>
> emptyrootcommit -- A ... M -- N ... Z
>
> so that snapshots N .. Z will not be changed.
$ echo $(git rev-parse N) $(git rev-parse M) >> .git/info/grafts
$ git filter-branch --tag-name-filter cat -- --all --not M
i.e. you graft the older history right before the younger history, then
you use git filter-branch to rewrite the parentship of the younger commits.
-- Hannes
next prev parent reply other threads:[~2009-10-09 6:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 1:22 combine git repo historically bill lam
2009-10-09 6:02 ` Johannes Sixt [this message]
2009-10-09 7:40 ` Christian Couder
2009-10-10 14:03 ` bill lam
2009-10-11 2:36 ` Christian Couder
2009-10-11 4:06 ` bill lam
2009-10-11 10:11 ` Christian Couder
2009-10-11 8:48 ` Jakub Narebski
2009-10-11 13:07 ` Johannes Sixt
2009-10-11 13:43 ` Christian Couder
2009-10-11 14:29 ` Jakub Narebski
2009-10-11 9:34 ` Andreas Schwab
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=4ACED204.3000907@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=cbill.lam@gmail.com \
--cc=git@vger.kernel.org \
/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).