From 5da91d0a07ca8fb9cec4884157069d878b62949c Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 27 Sep 2021 18:37:18 +0100 Subject: [PATCH] whoops merge partsig --- branch_merger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/branch_merger.sh b/branch_merger.sh index 3d1d287..c2b2a83 100755 --- a/branch_merger.sh +++ b/branch_merger.sh @@ -7,7 +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 libresoc-nmigen-fork +git merge -s octopus display-patch libresoc-merger libresoc-partsig # and back to this branch git checkout libresoc-merger -- 2.30.2