From 505790352ef01da959154da9a2be270a6c21212d Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Mon, 6 May 2019 14:48:14 -0300
Subject: Add mergerelease script

---
 mergerelease | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 mergerelease

diff --git a/mergerelease b/mergerelease
new file mode 100755
index 00000000..82242753
--- /dev/null
+++ b/mergerelease
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+[ "$1" ] || {
+   echo "usage.....: $0 <release-branch>"
+   echo "example...: $0 release-3.1.0"
+   echo
+   echo "Before running this, make sure branch is tagged:"
+   echo "   git tag -s v3.1.0"
+   echo "   git push origin v3.1.0"
+   echo
+   exit 1
+}
+
+v="$1"
+
+git fetch --all
+git checkout master
+git diff master $v > version.diff
+git merge --no-ff $v
+patch -R -p1 < version.diff
+git add luarocks-dev-1.rockspec
+git commit -av --amend
-- 
cgit v1.2.3-55-g6feb