add libresoc-merger script for combining multiple branches

diff --git a/branch_merger.sh b/branch_merger.sh
new file mode 100644 (file)
index 0000000..ba4b8f4
--- /dev/null
+++ b/branch_merger.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# first, in this branch, rebase against master.
+git rebase master
+
+# now rebase the "display" branch onto the "fork" branch
+git rebase --onto libresoc-nmigen-fork master display-patch