summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2019-06-01 15:42:03 -0700
committerJeff Carr <[email protected]>2019-06-01 15:42:03 -0700
commit9ed0fb858f579144f49fa7c153995727d8354f4c (patch)
treeeed85eb6a2d3f642c59cebe336ccde8a29c485a9
parenta9c1b9321e19d28a1b0b0368094a7d648837d763 (diff)
misc
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
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