From 2bcf1f9b2581f489a4c54aea260be3ef1a93994e Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 27 Sep 2021 18:35:15 +0100 Subject: [PATCH] add libresoc-nmigen-fork octopus --- branch_merger.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100755 => 100644 branch_merger.sh 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 -- 2.30.2