summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-03 12:50:41 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-03 12:50:57 +0100
commitd720c78c0019a3d225bb0098c1564fb8d9a45916 (patch)
treee0a3914130214bf9f0315b391da39d6b821a41bf
downloadalsa-driver-build-unstable-topic/tools.tar.gz
Create orphan branch for auto-mergetopic/tools
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--BRANCHES5
-rwxr-xr-xauto-merge17
2 files changed, 22 insertions, 0 deletions
diff --git a/BRANCHES b/BRANCHES
new file mode 100644
index 000000000..e7d6d05fc
--- /dev/null
+++ b/BRANCHES
@@ -0,0 +1,5 @@
+topic/tools
+stable/build
+# topic/modem-integrate
+# topic/hda-jack
+# topic/vt1732
diff --git a/auto-merge b/auto-merge
new file mode 100755
index 000000000..b97353b46
--- /dev/null
+++ b/auto-merge
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ ! -f BRANCHES ]; then
+ echo "No BRANCHES file"
+ exit 1
+fi
+
+git fetch -f stable
+
+while read r; do
+ case "$r" in
+ [a-z]*)
+ git merge $r
+ ;;
+ esac
+done < BRANCHES
+exit 0