|
|
|
|
|
by vkoskiv
961 days ago
|
|
I figured out a way to not have to paste in manually to the sequence editor. I wrote a script like this: ----- #!/bin/bash if [[ ! -f "$1" ]]; then exit 1 fi git rev-list --no-merges --date-order --reverse $(git branch -a | grep -v '*' | grep master) | awk '{print "p " $0}' > $1 exit 0 ----- Then I can just: ----- pushd monorepo GIT_SEQUENCE_EDITOR=../inject_reflist.sh git rebase -i --root --force-rebase popd ----- And off we go! Apparently there were a few branches + merges, and we have some ongoing feature branches, so I need to find a way to bring in branches other than master as well, preferably while conserving the merges as-is, instead of skipping them like I do above. |
|