From d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 4 Jul 2017 14:11:52 -0400
Subject: Small miscellaneous fixes

* mist

* Add back experimental section

* Remove update dev sh
---
 files/update-dev.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 files/update-dev.txt

(limited to 'files/update-dev.txt')

diff --git a/files/update-dev.txt b/files/update-dev.txt
new file mode 100644
index 00000000..91ff4c1b
--- /dev/null
+++ b/files/update-dev.txt
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Script to reset dev branch to master
+# Once it is squashed and merged on github
+# Copy this to a sh file, which is gitignored
+# So there won't be save conflicts
+
+git checkout dev
+git cmp hard rebase
+git branch -f dev-bak dev
+git checkout master
+git pull -f origin master
+git branch -f dev master
+git checkout dev
+git push -u -f origin dev
-- 
cgit v1.2.3