@p @jhpratt another vouch for git-absorb, it's the tool I use every day for PR/patch stack workflows and have no complaints.