diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-02-23 06:42:53 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-02-23 06:42:53 +0200 |
| commit | 48dfa0b541507a16d1ae2b8ab54679ffb812d80b (patch) | |
| tree | 75da9136139ab9e268959ed2042b1db611ed4c6b | |
| parent | c209aa6bff9f2421775880a10ea5cb41f37ca765 (diff) | |
| parent | 985825455031c54c78efd9e71c54833a6886a25d (diff) | |
| download | egawk-48dfa0b541507a16d1ae2b8ab54679ffb812d80b.tar.gz egawk-48dfa0b541507a16d1ae2b8ab54679ffb812d80b.tar.bz2 egawk-48dfa0b541507a16d1ae2b8ab54679ffb812d80b.zip | |
Merge branch 'master' into feature/api-mpfr
| -rw-r--r-- | helpers/ChangeLog | 4 | ||||
| -rwxr-xr-x | helpers/update-branches.sh | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/helpers/ChangeLog b/helpers/ChangeLog index d29071e3..a3d6815c 100644 --- a/helpers/ChangeLog +++ b/helpers/ChangeLog @@ -1,3 +1,7 @@ +2017-02-23 Arnold D. Robbins <arnold@skeeve.com> + + * update-branches.sh: New file. + 2016-10-23 Arnold D. Robbins <arnold@skeeve.com> * General: Remove trailing whitespace from all relevant files. diff --git a/helpers/update-branches.sh b/helpers/update-branches.sh new file mode 100755 index 00000000..659da8b8 --- /dev/null +++ b/helpers/update-branches.sh @@ -0,0 +1,19 @@ +#! /bin/sh + +if [ ! -d .git ] +then + echo you must run this script from the top level directory + exit 1 +fi + +git checkout master || exit + +features=$(git branch -a | grep /origin/feature/ | sed 's;.*/origin/;;') +others="porting" + +for i in $others $features +do + (git checkout $i && git pull && git merge master && git push) || break +done + +git checkout master || exit |