Re: [git-users] Re: Merging two repositories with history and tags/branches
From: "Sam Roberts" On Fri, Aug 9, 2013 at 12:04 AM, Thomas Ferris Nicolaisen wrote: What I would like to know is: Is this at all possible? If so, can someone point me in the right direction? git replace: http://stackoverflow.com/questions/6800692/how-do-git-grafts-and-replace-differ-are-grafts-now-deprecated Decent description is at http://progit.org/2010/03/17/replace.html, though most of the post is actually about how to split histories apart and manipulate them, useful in itself. Maybe useful, too: http://newartisans.com/2008/04/diving-into-git/#unique-entry-id-65 -- In addition, it should be noted that 'git replace' can replace a merge commit with a single parent commit and vice versa, so that grafts and replace are interchangeable techniques (at that level of control). For some the problem is the step that 'fakes up' the extra merge commit that is required by 'git replace' which isn't needed by grafts (which simply lists the parents). The problem being the need for an "ours" or a "theirs" strategy when creating the merge, and "theirs" doesn't even exist anymore. Philip (original poster of that SO question...) -- 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/groups/opt_out.
Re: [git-users] Re: Merging two repositories with history and tags/branches
On Fri, Aug 9, 2013 at 12:04 AM, Thomas Ferris Nicolaisen wrote: >> >> What I would like to know is: >> >> Is this at all possible? >> If so, can someone point me in the right direction? git replace: http://stackoverflow.com/questions/6800692/how-do-git-grafts-and-replace-differ-are-grafts-now-deprecated Decent description is at http://progit.org/2010/03/17/replace.html, though most of the post is actually about how to split histories apart and manipulate them, useful in itself. Maybe useful, too: http://newartisans.com/2008/04/diving-into-git/#unique-entry-id-65 -- 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/groups/opt_out.
[git-users] Re: Merging two repositories with history and tags/branches
> > > What I would like to know is: > >1. Is this at all possible? >2. If so, can someone point me in the right direction? > > Yeah, this is possible. The clue is grafting. Have a look at this screencast: http://blog.tfnico.com/2010/10/gitsvn-6-grafting-together-svn-history.html -- 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/groups/opt_out.