| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
Donnie Berkholz wrote: |
| 5 |
> I just came across a tool that may solve my previous concerns about |
| 6 |
> losing history when moving from an overlay to the main tree: |
| 7 |
> git-stitch-repo |
| 8 |
> <http://search.cpan.org/~book/Git-FastExport-0.07/script/git-stitch-repo>. |
| 9 |
> It's not part of the main git distribution, it's a standalone script. |
| 10 |
|
| 11 |
Looks good. Will that then let you push the combined tree back into a |
| 12 |
remote repo? I'm surprised there isn't an easier way to merge two |
| 13 |
trees, given that git's all about listing the parent commits. I'd have |
| 14 |
thought you could just import all the commits from the other tree, make |
| 15 |
a new commit with both as the parents, and possibly prune out |
| 16 |
dangling/unnecessary commits... |
| 17 |
|
| 18 |
Either way, it's good there's a solution to your problem. Does that |
| 19 |
mean people are happier about moving ahead with 1repo/tree or are there |
| 20 |
still other concerns? |
| 21 |
|
| 22 |
Mike 5:) |
| 23 |
-----BEGIN PGP SIGNATURE----- |
| 24 |
Version: GnuPG v2.0.9 (GNU/Linux) |
| 25 |
|
| 26 |
iEYEARECAAYFAkmQn34ACgkQu7rWomwgFXpcBACcCPthMXCS82NNRNL3VlB3FQRB |
| 27 |
7DEAn2epMBCxxcH/rtGwqa7dv2ViWkR7 |
| 28 |
=Mmtd |
| 29 |
-----END PGP SIGNATURE----- |
Archives