From dc3a3e24bc47777346057dc7a9ff1a760a6759d6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 4 Apr 2011 18:21:03 +0200
Subject: Add merge.sh script

---
 git/merge.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 git/merge.sh

(limited to 'git/merge.sh')

diff --git a/git/merge.sh b/git/merge.sh
new file mode 100755
index 0000000..c9ae535
--- /dev/null
+++ b/git/merge.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Assume this script never run via PATH.
+#
+self=`realpath $0`
+. `dirname $self`/modules
+
+wd=`pwd`
+
+if [ "$1" = "" ]; then
+  echo "source branch name expected" 1>&2
+  exit 1
+fi
+
+for i in $odb_modules; do
+  echo "merge $i" 1>&2
+  cd $i
+  git merge $*
+  cd $wd
+done
-- 
cgit v1.1