On Wed, Oct 07, 2015 at 02:52:45PM +0300, Konstantin Khomoutov wrote:
> On Wed, 7 Oct 2015 12:32:49 +0200
> Magnus Therning <mag...@therning.org> wrote:
> 
> > > No I like to do a copy with history from a repository into a
> > > directory of another repository
> > > 
> > > git <copy with history> T8Suite <to> TrionicSuites/T8Suite 
> > > 
> > > Both T8Suite and TrionicSuites are repros
> > 
> > I suspect Konstantin was only commenting on the organisation of the
> > code in the project, not on how you would merge the three repos into
> > a single one while keeping the history intact.
> > 
> > Recently I decided to move a project away from using submodules.  The
> > project had a master repo and half-a-dozen sub-repos.  When merging
> > all of these repos into a single large one I used subtrees to make
> > sure all history was kept. I can recommend it if you aren't put off
> > by having a git repo with multiple roots.
> > 
> > <https://groups.google.com/d/msg/git-users/EiAGI4Ixy7Y/xy6MS3YQAwAJ>
> 
> Did you run `git filter-branch` on all the participating subtrees
> before glueing them together?

Nope.  Both `tig` and `gitg` handles that fairly well without running
filter-branch first so I didn't bother.

/M

-- 
Magnus Therning                      OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

Finagle's First Law:
To study a subject best, understand it thoroughly before you start.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Attachment: signature.asc
Description: PGP signature

Reply via email to