Add merge helper
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 8 Oct 2020 17:32:53 +0000 (19:32 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 8 Oct 2020 17:32:53 +0000 (19:32 +0200)
merge-release.sh [new file with mode: 0755]

diff --git a/merge-release.sh b/merge-release.sh
new file mode 100755 (executable)
index 0000000..a87f9f4
--- /dev/null
@@ -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}";
+
+