From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 27 Sep 2021 17:35:15 +0000 (+0100)
Subject: add libresoc-nmigen-fork octopus
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2bcf1f9b2581f489a4c54aea260be3ef1a93994e;p=nmigen.git

add libresoc-nmigen-fork octopus
---

diff --git a/branch_merger.sh b/branch_merger.sh
old mode 100755
new mode 100644
index d01fb17..3d1d287
--- a/branch_merger.sh
+++ b/branch_merger.sh
@@ -7,4 +7,7 @@ git rebase master
 
 # now rebase the "display" branch onto the "fork" branch
 git checkout libresoc-nmigen-fork
-git merge -s octopus display-patch libresoc-merger
+git merge -s octopus display-patch libresoc-merger libresoc-nmigen-fork
+
+# and back to this branch
+git checkout libresoc-merger