diff options
-rwxr-xr-x | git/merge.sh | 20 |
1 files changed, 20 insertions, 0 deletions
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 |