From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Thu, 8 Oct 2020 17:32:53 +0000 (+0200)
Subject: Add merge helper
X-Git-Tag: v0.76.4~6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c98132e30e01a9638e61bd888c769d30e4e43ad5;p=brevno-suite%2Fhugo

Add merge helper
---

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