From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 27 Sep 2021 16:49:08 +0000 (+0100)
Subject: add libresoc-merger script for combining multiple branches
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2fa526c928d4468aff05c6a5e56ca2d93a3b0be;p=nmigen.git

add libresoc-merger script for combining multiple branches
---

diff --git a/branch_merger.sh b/branch_merger.sh
new file mode 100644
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