From 9ed0fb858f579144f49fa7c153995727d8354f4c Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sat, 1 Jun 2019 15:42:03 -0700
Subject: misc

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 60cc8de..7d6d8be 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,10 @@ push:
 update:
 	git pull
 	go get -v -t -u ./...
+
+merge-devel:
+	git checkout master
+	git pull origin master
+	git merge devel
+	git push origin master
+	git check devel
-- 
cgit v1.2.3