From: "H. Peter Anvin" <hpa@zytor.com>
To: Mathias Waack <Mathias.Waack@rantzau.de>
Cc: git@vger.kernel.org
Subject: Re: Joining Repositories
Date: Wed, 18 Jan 2006 08:38:45 -0800 [thread overview]
Message-ID: <43CE6F15.2050801@zytor.com> (raw)
In-Reply-To: <200601181325.59832.Mathias.Waack@rantzau.de>
Mathias Waack wrote:
> Hello everybody,
>
> we're using git with cogito as a frontend. For some reasons I forgot we have
> some repositories which belong to the same project. To simplify the whole
> thing I would like to join these repositories. It mainly means to move some
> directories. So lets say I have:
>
> /r1/.git
> /r2/.git
>
> and what I would like to have is
>
> /r/.git
> r1
> r2
>
> Of course the history should remain (otherwise it would be to easy).
>
> How should I do this?
>
Rename the files in each repository independently (with a checkin), then
merge the repositories.
Git *should* track across the rename, as long as it's "obvious".
-hpa
prev parent reply other threads:[~2006-01-18 16:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-18 12:25 Joining Repositories Mathias Waack
2006-01-18 12:51 ` Petr Baudis
2006-01-18 12:58 ` Petr Baudis
2006-01-18 14:01 ` Mathias Waack
2006-01-18 14:14 ` Petr Baudis
2006-01-19 11:36 ` Mathias Waack
2006-01-19 18:24 ` Junio C Hamano
2006-01-18 14:14 ` Andreas Ericsson
2006-01-18 14:09 ` Ryan Anderson
2006-01-18 14:21 ` Petr Baudis
2006-01-18 14:39 ` Ryan Anderson
2006-01-18 16:23 ` Linus Torvalds
2006-01-18 17:05 ` Petr Baudis
2006-01-18 17:33 ` Junio C Hamano
2006-01-18 18:03 ` Linus Torvalds
2006-01-18 17:30 ` Junio C Hamano
2006-01-18 18:22 ` Linus Torvalds
2006-01-18 19:09 ` Junio C Hamano
2006-01-18 20:09 ` Linus Torvalds
2006-01-18 22:47 ` Linus Torvalds
2006-01-18 23:15 ` Linus Torvalds
2006-01-19 2:12 ` Junio C Hamano
2006-01-19 9:03 ` Petr Baudis
2006-01-18 18:55 ` Ryan Anderson
2006-01-18 16:38 ` H. Peter Anvin [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=43CE6F15.2050801@zytor.com \
--to=hpa@zytor.com \
--cc=Mathias.Waack@rantzau.de \
--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).