Initial commit

diff --git a/add_repo b/add_repo
new file mode 100755 (executable)
index 0000000..4a6c425
--- /dev/null
+++ b/add_repo
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+name=$1
+url=$2
+branch=$3
+[[ -z "$name" ]] && {
+       echo "Need a remote name" 1>&2
+       exit 1
+}
+[[ -z "$url" ]] && {
+       echo "Need a URL" 1>&2
+       exit 1
+}
+[[ -z "$branch" ]] && branch="master"
+
+git remote add -t "$branch" "$name" "$url"
+git config remote."$name".tagopt "--no-tags"

diff --git a/do_merge b/do_merge
new file mode 100755 (executable)
index 0000000..1ede56c
--- /dev/null
+++ b/do_merge
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+while read name url ref; do
+       [[ -z "$ref" ]] && ref="master"
+       echo $name $ref
+       git merge -n $name/$ref
+       [[ -f .git/MERGE_HEAD ]] && {
+               echo $name $ref >>Next/conflicts
+               git reset --hard
+       }
+done <Next/control 2>&1 | tee Next/merge.log