From 6c817bf580df4ae4b9481b7b288902b3ce85e44f Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 23 Oct 2015 00:03:39 -0400
Subject: [PATCH] scripts

---
 dmaPushGhPages.sh              | 12 ++++++++++++
 dmaPush.sh => dmaPushMaster.sh |  0
 2 files changed, 12 insertions(+)
 create mode 100755 dmaPushGhPages.sh
 rename dmaPush.sh => dmaPushMaster.sh (100%)

diff --git a/dmaPushGhPages.sh b/dmaPushGhPages.sh
new file mode 100755
index 00000000..4c0c8cb2
--- /dev/null
+++ b/dmaPushGhPages.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd ~/Research/CBAStuff/git/dmdesign
+git co master
+git fetch upstream
+git merge upstream/gh-pages
+git push origin master
+cd ~/Research/CBAStuff/git/archives/dma
+git fetch origin
+git merge origin/master
+git subtree pull -P Web/dmdesign fabpeople:people/amanda.ghassaei/dmdesign master --squash
+git push origin master
diff --git a/dmaPush.sh b/dmaPushMaster.sh
similarity index 100%
rename from dmaPush.sh
rename to dmaPushMaster.sh
-- 
GitLab