misc

Signed-off-by: Jeff Carr <jcarr@wit.com>
2019-06-01 15:42:03 -07:00 · 2019-06-01 15:42:03 -07:00 · 40fef03fa8
parent 035daca718
commit 40fef03fa8
1 changed files with 7 additions and 0 deletions
--- a/7
+++ b/7
@ -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