From 99e961a32e8249a61de8f19ac8eda3668f5db436 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 28 Mar 2014 11:48:10 +0100
Subject: [PATCH] misc: Add script to merge subtrees and update them

---
 merge-init.sh    | 21 +++++++++++++++++++++
 merge-osmocom.sh | 10 ++++++++++
 2 files changed, 31 insertions(+)
 create mode 100755 merge-init.sh
 create mode 100755 merge-osmocom.sh

diff --git a/merge-init.sh b/merge-init.sh
new file mode 100755
index 0000000000..7f8469a3ba
--- /dev/null
+++ b/merge-init.sh
@@ -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
diff --git a/merge-osmocom.sh b/merge-osmocom.sh
new file mode 100755
index 0000000000..8bcb920c3a
--- /dev/null
+++ b/merge-osmocom.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+merge()
+{
+	git pull -s subtree $1 master
+}
+
+
+merge meta-sysmocom-bsp
+merge meta-telephony