diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-04-04 18:21:03 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-04-04 18:21:03 +0200 |
| commit | dc3a3e24bc47777346057dc7a9ff1a760a6759d6 (patch) | |
| tree | 6387daddd9cc0e10b5639b3c52f662635116dfdb | |
| parent | b6fa40f4d953d7627510e3070bc1247fd7d9694a (diff) | |
Add merge.sh script1.3.0
| -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 |