misc: Add script to merge subtrees and update them

This commit is contained in:
Holger Hans Peter Freyther 2014-03-28 11:48:10 +01:00
parent 95144ba7b2
commit 99e961a32e
2 changed files with 31 additions and 0 deletions

21
merge-init.sh Executable file
View File

@ -0,0 +1,21 @@
#!/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

10
merge-osmocom.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
merge()
{
git pull -s subtree $1 master
}
merge meta-sysmocom-bsp
merge meta-telephony