Databases
StackOverflow2013
Postsdbo
POcombining unrelated git repositories retaining history/branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POcombining unrelated git repositories retaining history/branches
    primarykey
    data
    text
    <p>we're having 3 separate git repositories (each with some branches) which we'd like to combine into one keeping full history and the ability to access the branches, like so:</p> <p>so this is what we have. 3 repos:</p> <pre><code>/A/.git /B/.git /C/.git </code></pre> <p>and we'd like to have one super-repo with 3 subdirectories:</p> <pre><code>super/.git super/A super/B super/C </code></pre> <p>and say when switching to branch feature1 (which was originally in repo B, introduced at a time that repo C didn't exist yet) we'd expect the result to be:</p> <pre><code>super/.git super/A super/B </code></pre> <p>we've read <a href="https://stackoverflow.com/questions/277029/combining-multiple-git-repositories">Combining multiple git repositories</a> but had troubles using git-stitch-repo which basically worked as advertised only that quite a large number of commits were missing in the super-repo (without any error messages that would point to a problem). </p> <p>any idea what we could be doing wrong here?</p> <p><strong>EDIT</strong> we are aware of submodules and subtree-merging, but both are not an option. this is supposed to be a one time operation. we need the repos joined once and forever. </p> <p><strong>EDIT</strong> probably a simpler way to put basically the same question: say we have one repo with 3 totally unrelated branches. we can merge them without a conflict to one branch (since they share no files). now when looking at the history we see 3 unrelated branches of commits and the one point where they come together. but what we'd like to see is one branch made up of the interleaved (by date/time) commits of all 3 branches. </p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USjoreg
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. USthalm
      1. VTFavorite
    1. CODid you try any of the other methods suggested in that question (Combining multiple git repositories)? There are several options given there.
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. USebneter
    2. COyes we did. none of them seems to do what git-stitch-repo does, which really interleaves the commits in a timely order so that the resulting repo totally feels as if it included all parts from the beginning. only, as mentioned, git-stitch-repo randomly leaves files out..
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. USjoreg
    3. COok then, make a file from `git log --format=%d%H` from each branch. Pipe this through sort then to xargs and git cherry-pick on a new branch. You may want to flatten out the histories first with rebase.
      singulars
      1. POcombining unrelated git repositories retaining history/branches
      1. USAdam Dymitruk
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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