22 lines
478 B
Bash
22 lines
478 B
Bash
|
#!/bin/sh
|
||
|
|
||
|
#!/bin/sh
|
||
|
|
||
|
|
||
|
merge()
|
||
|
{
|
||
|
echo $1
|
||
|
git remote add $1 $2
|
||
|
git fetch $1
|
||
|
git merge -s ours --no-commit $1/master
|
||
|
git read-tree --prefix=$1/ -u $1/master
|
||
|
git commit
|
||
|
git pull -s subtree $1 master
|
||
|
}
|
||
|
|
||
|
|
||
|
merge meta-telephony git://gitorious.org/sysmocom-openembedded/meta-telephony.git
|
||
|
merge meta-sysmocom-bsp git://git.sysmocom.de/poky/meta-sysmocom-bsp
|
||
|
merge meta-smalltalk git://github.com/sysmocom/meta-smalltalk.git
|
||
|
merge meta-qt5 git://github.com/sysmocom/meta-qt5.git
|