summaryrefslogtreecommitdiff
path: root/git/merge.sh
blob: c9ae535c328063c721ee773979172e24e8a96a14 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
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