From eeff76dbd706341b4a500599595b4b928092cf4e Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Fri, 14 Nov 2014 14:00:22 +0000
Subject: [PATCH] Script to merge master/site into gh-pages

---
 bin/merge-into-gh-pages | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 bin/merge-into-gh-pages

diff --git a/bin/merge-into-gh-pages b/bin/merge-into-gh-pages
new file mode 100755
index 00000000..a21a6f1e
--- /dev/null
+++ b/bin/merge-into-gh-pages
@@ -0,0 +1,17 @@
+#! /bin/sh
+set -e
+
+MERGE_ARGS="-X subtree=site"
+
+merge_dir=$(mktemp -d -t weave-merge)/weave
+git clone -b gh-pages . $merge_dir
+
+pushd $merge_dir
+git pull --ff-only git@github.com:zettio/weave gh-pages
+git fetch origin master
+git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master
+
+popd
+git fetch $merge_dir gh-pages:gh-pages
+
+# rm -rf $merge_dir