Merge git repositories into one

Mein Vorhaben war es mehrere git repo’s unter einem (parent) repo zusammenzufassen. Dafür gibt es mehrere Möglichkeiten dies zu erledigen. Folgendes Vorgehen:

  • parent repo anlengen
    mkdir parent
    cd parent
    touch README.md
    git add README.md
    git commit -m "create README.md"
    git remote add origin https://github.com/USER/parent.git
    git push -u origin master
    
  1. vorhandere repo via submodule (link) hinzufügen
    git submodule add https://github.com/USER/projectA.git projectA
    git commit -am "merge projectA into parent"
    
  2. vorhandenes repo via subtree hinzufügen
    git remote add -f projectA https://github.com/USER/projectA.git
    git read-tree --prefix=projectA/ -u projectA/master
    git pull -s subtree projectA master
    git commit -m "merge projectA into parent"
    
  3. vorhandenes repo inklusive commit’s hinzufügen
    git remote add -f projectA https://github.com/USER/projectA.git
    git merge -s ours --no-commit projectA/master
    git read-tree --prefix=projectA/ -u projectA/master
    git commit -m "merge projectA into parent"
    

Links 2014 KW 12

Neulich im Internet…

Links 2014 KW 09

Neulich im Internet…

  • spritzinc.com – Maybe change the way people read on digital devices
  • projectara.com – Google ARA smartphone project
  • IPvFoo – Google Chrome Extension witch display a summary of IPv4, IPv6, and HTTPS information across all page elements
  • neoVIM@github – vim’s rebirth for the 21st century (neovim.org)
  • mastertheboss.com – JBossians network
  • jointswp.com – Foundation 5 WordPress theme
  • Buzz! – A Javascript HTML5 Audio library
  • FreeBSD 10 tutorials – Great videos from hukl
  • bsdnow.tv – A Weekly BSD Podcast – News, Interviews and Tutorials
  • Unix Toolbox – Collection of usefull Unix/Linux/BSD commands and tasks
  • spring.io – Java Spring IO platform
  • bpmn.io – Simplifies creating, embedding and extending BPMN diagrams (camunda and zalando)