From c2fa526c928d4468aff05c6a5e56ca2d93a3b0be Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 27 Sep 2021 17:49:08 +0100
Subject: [PATCH] add libresoc-merger script for combining multiple branches

---
 branch_merger.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 branch_merger.sh

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
-- 
2.30.2