git-drink-base, really handy git command, surprised that not a lot of people know about it:
git-drink-base: drink non-staged unstaged bases from any quiltimported non-filter-branched upstream trees
https://git-man-page-generator.lokaltog.net/#cc3ec3bd1ad3e393b1969dc14eba1267
Be careful of the –plunge-history option though