My Way to merge scilab/master branch into a totally different repository - Scilab Wiki

My Way to merge scilab/master branch into a totally different repository

To do only one time

Get the repository

   1 [$SHELL] mkdir ~/repositories
   2 [$SHELL] cd ~/repositories
   3 [$SHELL] git clone git://git.scilab.org/vtk

Edit the .git/config file

   1 [$SHELL] cd ~/repositories/vtk/.git
   2 [$SHELL] nano config

Add the following lines :

[remote "scilab_master"]
        url = git://git.scilab.org/scilab
        fetch = +refs/heads/master:refs/remotes/origin/scilab_master

Get the "git://git.scilab.org/scilab" objects

   1 [$SHELL] git fetch --no-tags scilab_master

merge the origin/scilab_master with your local master branch

   1 [$SHELL] git merge origin/scilab_master

Every time you need to merge the master branch of "git://git.scilab.org/scilab" with your local master branch

Update the list of "git://git.scilab.org/scilab" objects (and, as a result, the origin/scilab_master branch) ...

   1 [$SHELL] git fetch --no-tags scilab_master

... and merge

   1 [$SHELL] git merge origin/scilab_master

My Way to merge scilab/master branch into a totally different repository (last edited 2009-06-09 14:40:33 by pmarecha)