diff options
-rw-r--r-- | BRANCHES | 5 | ||||
-rwxr-xr-x | auto-merge | 17 |
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 |