Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

How to import a plugin from before the subtree merge

Florian Vichot edited this page Jul 16, 2013 · 3 revisions

So, you want to import a plugin written before the Big Subtree Merge. Here's how to do it :

  1. Add a medInria-plugins remote on your medInria repo :

git remote add plugins https://github.com/medInria/medInria-plugins.git

  1. Add the remote of your fork :

git remote add plugins-bob https://github.com/bob/medInria-plugins.git

  1. Switch to your plugin branch :

git checkout bob/my-plugin

  1. Rebase this plugin on the medInria-plugins master branch :

git rebase plugins/master

  1. Now the bit of magic, rebase your plugin onto the medInria master :

git rebase -s subtree master

And that should be it !