Skip to content

Commit

Permalink
Add merge helper
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Oct 8, 2020
1 parent 33e9d79 commit c98132e
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions merge-release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

if (( $# < 1 ));
then
echo "USAGE: ./merge-release.sh 0.76.0"
exit 1
fi

die() { echo "$*" 1>&2 ; exit 1; }

v=$1
git merge "release-${v}" || die;
git push || die;

git checkout stable || die;
git reset --hard "v${v}" || die;
git push -f || die;

git checkout master || die;

git subtree push --prefix=docs/ docs-local "tempv${v}";


0 comments on commit c98132e

Please sign in to comment.