StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PORestoring History within two loosely forked git projects
text
Body
copied!<p>There are 3 projects each with their own git repo:</p> <ul> <li><strong>Project A</strong>, a project independent of B</li> <li><strong>Project B</strong>, a project independent of A</li> <li><strong>Project AB</strong>, a project that uses some of A and some of B. An amalgamation of sources, file structures, etc, with some modifications to allow the two to blend properly.</li> </ul> <p>Project A and Project B are mostly dead, but did receive minor patches after AB was created, some of which were later ported to AB. AB's git repo was created without history from either A or B. It is easy for me to tell which file or directory came from A and which came from B, and I know what commit each of the initial files was taken from.</p> <p><strong>How do I Restore history for AB before the init, assuming that all files in AB are based on files from A or B?</strong></p> <p>Keep in mind the following:</p> <ul> <li>Files from A may be in a B-like directory, and vice versa, so I should be able to handle moves</li> <li>At some point, I'd like to rebase AB's ported patches so that they are attributed to a merge from either A or B.</li> <li>I would like for A or B to be able to merge AB, although having only one of them be able to do this would be okay, as long as I can control which one.</li> <li>There are about 30-50 files, so it would still be possible for me to rebase for each file, it would be preferred if I didn't have to.</li> </ul>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload