From d720c78c0019a3d225bb0098c1564fb8d9a45916 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 3 Jan 2013 12:50:41 +0100 Subject: Create orphan branch for auto-merge Signed-off-by: Takashi Iwai --- BRANCHES | 5 +++++ auto-merge | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 BRANCHES create mode 100755 auto-merge 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 -- cgit 1.2.3-korg