projects
/
nmigen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1fd97b
)
whoops merge partsig
libresoc-merger
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Mon, 27 Sep 2021 17:37:18 +0000
(18:37 +0100)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Mon, 27 Sep 2021 17:37:18 +0000
(18:37 +0100)
branch_merger.sh
patch
|
blob
|
history
diff --git
a/branch_merger.sh
b/branch_merger.sh
index 3d1d287f62240161d0ed3571eadf94a77d977226..c2b2a833897e1c5a2c95c6e30cd8d24b1b2d0a02 100755
(executable)
--- 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